You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by we...@apache.org on 2012/12/04 14:13:53 UTC
svn commit: r1416922 -
/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-cdi/src/main/java/org/apache/myfaces/extensions/scripting/cdi/core/CDIThrowAwayClassloader.java
Author: werpu
Date: Tue Dec 4 13:13:52 2012
New Revision: 1416922
URL: http://svn.apache.org/viewvc?rev=1416922&view=rev
Log:
EXTSCRIPT-183 final fix for the npe
Modified:
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-cdi/src/main/java/org/apache/myfaces/extensions/scripting/cdi/core/CDIThrowAwayClassloader.java
Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-cdi/src/main/java/org/apache/myfaces/extensions/scripting/cdi/core/CDIThrowAwayClassloader.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-cdi/src/main/java/org/apache/myfaces/extensions/scripting/cdi/core/CDIThrowAwayClassloader.java?rev=1416922&r1=1416921&r2=1416922&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-cdi/src/main/java/org/apache/myfaces/extensions/scripting/cdi/core/CDIThrowAwayClassloader.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-cdi/src/main/java/org/apache/myfaces/extensions/scripting/cdi/core/CDIThrowAwayClassloader.java Tue Dec 4 13:13:52 2012
@@ -60,13 +60,13 @@ public class CDIThrowAwayClassloader ext
public Class<?> loadClass(String className) throws ClassNotFoundException
{
ClassResource res = (ClassResource) WeavingContext.getInstance().getResource(className);
-
+ boolean tainted = (res != null) ? res.isTainted() : false;
Class clazz = _delegate.loadClass(className);
if (res == null)
{
return clazz;
}
- boolean tainted = res.isTainted();
+ ;
Annotation[] anns = clazz.getAnnotations();
boolean cdiAnnotation = false;
//@Named required without named no cdi bean