| commit | 88f42f3476df6f42e2d496c306d953be485be815 | [log] [tgz] |
|---|---|---|
| author | Werner Punz <werpu@apache.org> | Thu Mar 08 12:54:55 2012 +0000 |
| committer | Werner Punz <werpu@apache.org> | Thu Mar 08 12:54:55 2012 +0000 |
| tree | c09344d62a8fd10c04038e08e9beac6c9609d30a | |
| parent | f2549eb4c1a631d48b158f5ccbda08217ed4968b [diff] |
EXTSCRIPT-154: Code Rewrite/Refactoring, ongoing works in the classloader area, integration of jsf2 git-svn-id: https://svn.apache.org/repos/asf/myfaces/extensions/scripting/trunk@1298375 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/jsf/adapters/CustomChainLoader.java b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/jsf/adapters/CustomChainLoader.java index f95e662..404a741 100644 --- a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/jsf/adapters/CustomChainLoader.java +++ b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/jsf/adapters/CustomChainLoader.java
@@ -111,7 +111,7 @@ { File targetDirectory = WeavingContext.getInstance().getConfiguration().getCompileTarget(); File target = ClassUtils.classNameToFile(targetDirectory.getAbsolutePath(), name); - if (!target.exists()) ClassUtils.getContextClassLoader().loadClass(name); + if (!target.exists()) return null; //otherwise check if tainted and if not simply return the class stored if(name.contains("TestNavigationHandler")) { System.out.println("debugpoint found");
diff --git a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/jsf/startup/StartupServletContextPluginChainLoader.java b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/jsf/startup/StartupServletContextPluginChainLoader.java index 75c3cef..df9f3c0 100644 --- a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/jsf/startup/StartupServletContextPluginChainLoader.java +++ b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/jsf/startup/StartupServletContextPluginChainLoader.java
@@ -22,7 +22,6 @@ import org.apache.myfaces.webapp.StartupListener; import rewrite.org.apache.myfaces.extensions.scripting.core.context.WeavingContext; import rewrite.org.apache.myfaces.extensions.scripting.core.monitor.ResourceMonitor; -import rewrite.org.apache.myfaces.extensions.scripting.jsf.adapters.CustomChainLoader; import rewrite.org.apache.myfaces.extensions.scripting.jsf.adapters.MyFacesSPI; import javax.servlet.ServletContext;