You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@velocity.apache.org by nb...@apache.org on 2008/08/13 01:36:36 UTC

svn commit: r685370 - in /velocity/engine/trunk/src/java/org/apache/velocity: app/event/NullSetEventHandler.java runtime/parser/node/ASTAndNode.java runtime/parser/node/ASTOrNode.java

Author: nbubna
Date: Tue Aug 12 16:36:35 2008
New Revision: 685370

URL: http://svn.apache.org/viewvc?rev=685370&view=rev
Log:
boolean performance tweaks (thx to Jarkko Viinamaki)

Modified:
    velocity/engine/trunk/src/java/org/apache/velocity/app/event/NullSetEventHandler.java
    velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTAndNode.java
    velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTOrNode.java

Modified: velocity/engine/trunk/src/java/org/apache/velocity/app/event/NullSetEventHandler.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/java/org/apache/velocity/app/event/NullSetEventHandler.java?rev=685370&r1=685369&r2=685370&view=diff
==============================================================================
--- velocity/engine/trunk/src/java/org/apache/velocity/app/event/NullSetEventHandler.java (original)
+++ velocity/engine/trunk/src/java/org/apache/velocity/app/event/NullSetEventHandler.java Tue Aug 12 16:36:35 2008
@@ -87,7 +87,8 @@
 
         public Object getReturnValue()
         {            
-            return new Boolean(result);
+            // return new Boolean(result);
+            return result ? Boolean.TRUE : Boolean.FALSE;
         }
 
         public boolean isDone()

Modified: velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTAndNode.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTAndNode.java?rev=685370&r1=685369&r2=685370&view=diff
==============================================================================
--- velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTAndNode.java (original)
+++ velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTAndNode.java Tue Aug 12 16:36:35 2008
@@ -70,7 +70,8 @@
         throws MethodInvocationException
     {
         // TODO: JDK 1.4+ -> valueOf()
-        return new Boolean(evaluate(context));
+        // return new Boolean(evaluate(context));
+        return evaluate(context) ? Boolean.TRUE : Boolean.FALSE;
     }
 
     /**

Modified: velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTOrNode.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTOrNode.java?rev=685370&r1=685369&r2=685370&view=diff
==============================================================================
--- velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTOrNode.java (original)
+++ velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTOrNode.java Tue Aug 12 16:36:35 2008
@@ -70,7 +70,8 @@
         throws MethodInvocationException
     {
         // TODO: JDK 1.4+ -> valueOf()
-        return new Boolean(evaluate(context));
+        // return new Boolean(evaluate(context));
+        return evaluate(context) ? Boolean.TRUE : Boolean.FALSE;
     }
 
     /**