velocity-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wgl...@apache.org
Subject svn commit: r365339 - /jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/VelocimacroFactory.java
Date Mon, 02 Jan 2006 12:42:19 GMT
Author: wglass
Date: Mon Jan  2 04:42:18 2006
New Revision: 365339

URL: http://svn.apache.org/viewcvs?rev=365339&view=rev
Log:
prevent NPE when velocimacro.library.autoreload=true and there is no global velocimacro library

Modified:
    jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/VelocimacroFactory.java

Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/VelocimacroFactory.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/VelocimacroFactory.java?rev=365339&r1=365338&r2=365339&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/VelocimacroFactory.java
(original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/VelocimacroFactory.java
Mon Jan  2 04:42:18 2006
@@ -390,7 +390,7 @@
          *  template is one of the library templates
          */
         
-        if ( getAutoload() )
+        if ( getAutoload() && (macroLibVec != null) )
         {
             /*
              *  see if this is a library template



---------------------------------------------------------------------
To unsubscribe, e-mail: velocity-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: velocity-dev-help@jakarta.apache.org


Mime
View raw message