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 2010/09/24 11:18:30 UTC

svn commit: r1000770 - /myfaces/extensions/scripting/branches/1_0_prepare_2/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/api/BaseWeaver.java

Author: werpu
Date: Fri Sep 24 09:18:28 2010
New Revision: 1000770

URL: http://svn.apache.org/viewvc?rev=1000770&view=rev
Log:
Merged from trunk
https://issues.apache.org/jira/browse/EXTSCRIPT-144

removing an npe in the jsf 1.2 case [from revision 1000763]

Modified:
    myfaces/extensions/scripting/branches/1_0_prepare_2/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/api/BaseWeaver.java

Modified: myfaces/extensions/scripting/branches/1_0_prepare_2/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/api/BaseWeaver.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/branches/1_0_prepare_2/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/api/BaseWeaver.java?rev=1000770&r1=1000769&r2=1000770&view=diff
==============================================================================
--- myfaces/extensions/scripting/branches/1_0_prepare_2/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/api/BaseWeaver.java (original)
+++ myfaces/extensions/scripting/branches/1_0_prepare_2/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/api/BaseWeaver.java Fri Sep 24 09:18:28 2010
@@ -332,7 +332,8 @@ public abstract class BaseWeaver impleme
             */
             _beanHandler.refreshAllManagedBeans();
         }
-        _annotationScanner.scanPaths();
+        if(_annotationScanner != null)
+            _annotationScanner.scanPaths();
 
 
         _beanHandler.personalScopeRefresh();