commit 04b2602634f1de3b65dde64fcd8935ac57c0aeca
author Werner Punz <werpu@apache.org> Tue Dec 04 12:08:57 2012 +0000
committer Werner Punz <werpu@apache.org> Tue Dec 04 12:08:57 2012 +0000
tree 0cf18f2ce4800ce3d19fcd95fd01968e24cb10eb
parent fd312a1a832ec4745a5ce0b8eba1e10f72809d13

https://issues.apache.org/jira/browse/EXTSCRIPT-183

git-svn-id: https://svn.apache.org/repos/asf/myfaces/extensions/scripting/trunk@1416907 13f79535-47bb-0310-9956-ffa450edef68

extscript-core-root/extscript-cdi/src/main/java/org/apache/myfaces/extensions/scripting/cdi/core/CDIThrowAwayClassloader.java

diff --git a/extscript-core-root/extscript-cdi/src/main/java/org/apache/myfaces/extensions/scripting/cdi/core/CDIThrowAwayClassloader.java b/extscript-core-root/extscript-cdi/src/main/java/org/apache/myfaces/extensions/scripting/cdi/core/CDIThrowAwayClassloader.java
index 1482e9d..aa1f038 100644
--- a/extscript-core-root/extscript-cdi/src/main/java/org/apache/myfaces/extensions/scripting/cdi/core/CDIThrowAwayClassloader.java
+++ b/extscript-core-root/extscript-cdi/src/main/java/org/apache/myfaces/extensions/scripting/cdi/core/CDIThrowAwayClassloader.java
@@ -59,25 +59,28 @@
     @Override
     public Class<?> loadClass(String className) throws ClassNotFoundException
     {
-        Class clazz = _delegate.loadClass(className);
         ClassResource res = (ClassResource) WeavingContext.getInstance().getResource(className);
-        if(res == null) {
+        boolean tainted = res.isTainted();
+        Class clazz = _delegate.loadClass(className);
+        if (res == null)
+        {
             return clazz;
         }
 
         Annotation[] anns = clazz.getAnnotations();
         boolean cdiAnnotation = false;
-        if(anns == null || anns.length == 0) {
-            cdiAnnotation = true;
-        } else {
-            for(Annotation ann: anns) {
-               cdiAnnotation = ann instanceof Named;
-               if(cdiAnnotation) break;
-            }
+        //@Named required without named no cdi bean
+        for (Annotation ann : anns)
+        {
+            cdiAnnotation = ann instanceof Named;
+            if (cdiAnnotation) break;
         }
         //we have to taint so that the extscript
         // scanner can take over
-        res.setTainted(!cdiAnnotation);
+        if (!cdiAnnotation)
+        {
+            res.setTainted(tainted);
+        }
         return clazz;
     }
 
@@ -140,7 +143,6 @@
         return ClassLoader.getSystemClassLoader();
     }
 
-
     @Override
     public void setDefaultAssertionStatus(boolean b)
     {

extscript-core-root/extscript-spring/src/main/java/org/apache/myfaces/extensions/scripting/spring/context/CompilationAwareContextLoader.java

diff --git a/extscript-core-root/extscript-spring/src/main/java/org/apache/myfaces/extensions/scripting/spring/context/CompilationAwareContextLoader.java b/extscript-core-root/extscript-spring/src/main/java/org/apache/myfaces/extensions/scripting/spring/context/CompilationAwareContextLoader.java
index 2c94b6e..e67c4fe 100644
--- a/extscript-core-root/extscript-spring/src/main/java/org/apache/myfaces/extensions/scripting/spring/context/CompilationAwareContextLoader.java
+++ b/extscript-core-root/extscript-spring/src/main/java/org/apache/myfaces/extensions/scripting/spring/context/CompilationAwareContextLoader.java
@@ -51,7 +51,6 @@
 
         //we now init the scripting system
 
-
         Class contextClass = determineContextClass(servletContext);
         if (!ConfigurableWebApplicationContext.class.isAssignableFrom(contextClass))
         {