commit bc9a42622c8b3e6e5a213040aa9b1455f2d24be4
author William Glass-Husain <wglass@apache.org> Fri Sep 29 04:59:53 2006 +0000
committer William Glass-Husain <wglass@apache.org> Fri Sep 29 04:59:53 2006 +0000
tree ffc0dcd571d6a7dc19a821ca3fe462de2838fa35
parent 3f30b4df31513a458813675bff48acd84c577214

tweaked inner class of method cache.  Related to VELOCITY-453.

git-svn-id: https://svn.apache.org/repos/asf/jakarta/velocity/engine/trunk@451120 13f79535-47bb-0310-9956-ffa450edef68

src/java/org/apache/velocity/runtime/parser/node/ASTMethod.java

diff --git a/src/java/org/apache/velocity/runtime/parser/node/ASTMethod.java b/src/java/org/apache/velocity/runtime/parser/node/ASTMethod.java
index 1643f6d..f20e03c 100644
--- a/src/java/org/apache/velocity/runtime/parser/node/ASTMethod.java
+++ b/src/java/org/apache/velocity/runtime/parser/node/ASTMethod.java
@@ -19,6 +19,7 @@
 import java.lang.reflect.InvocationTargetException;
 
 import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang.StringUtils;
 import org.apache.velocity.app.event.EventHandlerUtil;
 import org.apache.velocity.context.InternalContextAdapter;
 import org.apache.velocity.exception.MethodInvocationException;
@@ -326,8 +327,12 @@
 
         public MethodCacheKey(String methodName, Class[] params)
         {
-            this.methodName = methodName;
-            this.params = params;
+            /** 
+             * Should never be initialized with nulls, but to be safe we refuse 
+             * to accept them.
+             */
+            this.methodName = (methodName != null) ? methodName : StringUtils.EMPTY;
+            this.params = (params != null) ? params : ArrayUtils.EMPTY_CLASS_ARRAY;
         }
 
         /**
@@ -336,22 +341,13 @@
         public boolean equals(Object o)
         {
             /** 
-             * null check is not strictly needed (due to sole 
-             * initialization above) but it seems more safe
-             * to include it.
-             */
+             * note we skip the null test for methodName and params
+             * due to the earlier test in the constructor
+             */            
             if (o instanceof MethodCacheKey) 
             {
-                final MethodCacheKey other = (MethodCacheKey) o;
-                if ((params == null) || (other.params == null))
-                {
-                    return params == other.params;
-                }             
-                
-                /**
-                 * similarly, do null check on each array subscript.
-                 */
-                else if (params.length == other.params.length && 
+                final MethodCacheKey other = (MethodCacheKey) o;                
+                if (params.length == other.params.length && 
                         methodName.equals(other.methodName)) 
                 {              
                     for (int i = 0; i < params.length; ++i) 
@@ -383,15 +379,9 @@
             int result = 17;
 
             /** 
-             * null check is not strictly needed (due to sole 
-             * initialization above) but it seems more safe to 
-             * include it.
-             */
-            if (params == null)
-            {
-                return result;
-            }
-            
+             * note we skip the null test for methodName and params
+             * due to the earlier test in the constructor
+             */            
             for (int i = 0; i < params.length; ++i)
             {
                 final Class param = params[i];
@@ -401,11 +391,8 @@
                 }
             }
             
-            if (methodName != null)
-            {
-                result = result * 37 + methodName.hashCode();
-            }
-            
+            result = result * 37 + methodName.hashCode();
+
             return result;
         } 
     }