svn commit: r345296 - /jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTReference.java

[wglass]

Author: wglass
Date: Thu Nov 17 10:16:37 2005
New Revision: 345296

URL: http://svn.apache.org/viewcvs?rev=345296&view=rev
Log:
Fixed NPE when subelement of reference is null.  

Thanks to Alexey Panchenko for the patch.

Modified:
    
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTReference.java

Modified: 
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTReference.java
URL: 
http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTReference.java?rev=345296&r1=345295&r2=345296&view=diff
==============================================================================
--- 
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTReference.java
 (original)
+++ 
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTReference.java
 Thu Nov 17 10:16:37 2005
@@ -172,6 +172,10 @@
             for (int i = 0; i < numChildren; i++)
             {
                 result = getChild(i).execute(result,context);
+                if (result == null)
+                {
+                    break;
+                }
             }
 
             return result;



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]