svn commit: r1758467 - /velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTMethod.java

[cbrisson]

Author: cbrisson
Date: Tue Aug 30 20:56:39 2016
New Revision: 1758467

URL: http://svn.apache.org/viewvc?rev=1758467&view=rev
Log:
[engine] do not wrap java.lang.Error in method invocation (fixes VELOCITY-798)

Modified:
    
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTMethod.java

Modified: 
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTMethod.java
URL: 
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTMethod.java?rev=1758467&r1=1758466&r2=1758467&view=diff
==============================================================================
--- 
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTMethod.java
 (original)
+++ 
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTMethod.java
 Tue Aug 30 20:56:39 2016
@@ -237,9 +237,16 @@ public class ASTMethod extends SimpleNod
     private Object handleInvocationException(Object o, InternalContextAdapter 
context, Throwable t)
     {
         /*
+         * Errors should not be wrapped
+         */
+        if (t instanceof Error)
+        {
+            throw (Error)t;
+        }
+        /*
          * We let StopCommands go up to the directive they are for/from
          */
-        if (t instanceof StopCommand)
+        else if (t instanceof StopCommand)
         {
             throw (StopCommand)t;
         }