svn commit: r1817305 - /tomcat/trunk/java/javax/el/Util.java

[markt]

Author: markt
Date: Wed Dec  6 15:43:33 2017
New Revision: 1817305

URL: http://svn.apache.org/viewvc?rev=1817305&view=rev
Log:
SpotBugs
Simplify.
Remove unnecessary null checks.
Make another null check unnecessary.

Modified:
    tomcat/trunk/java/javax/el/Util.java

Modified: tomcat/trunk/java/javax/el/Util.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/Util.java?rev=1817305&r1=1817304&r2=1817305&view=diff
==============================================================================
--- tomcat/trunk/java/javax/el/Util.java (original)
+++ tomcat/trunk/java/javax/el/Util.java Wed Dec  6 15:43:33 2017
@@ -37,6 +37,8 @@ import java.util.concurrent.locks.Reentr
 
 class Util {
 
+    private static final Class<?>[] EMPTY_CLASS_ARRAY = new Class<?>[0];
+
     /**
      * Checks whether the supplied Throwable is one that needs to be
      * rethrown and swallows all others.
@@ -208,12 +210,8 @@ class Util {
 
         List<Wrapper> wrappers = Wrapper.wrap(methods, methodName);
 
-        Wrapper result = findWrapper(
-                clazz, wrappers, methodName, paramTypes, paramValues);
+        Wrapper result = findWrapper(clazz, wrappers, methodName, paramTypes, 
paramValues);
 
-        if (result == null) {
-            return null;
-        }
         return getMethod(clazz, (Method) result.unWrap());
     }
 
@@ -227,12 +225,7 @@ class Util {
 
         Map<Wrapper,MatchResult> candidates = new HashMap<>();
 
-        int paramCount;
-        if (paramTypes == null) {
-            paramCount = 0;
-        } else {
-            paramCount = paramTypes.length;
-        }
+        int paramCount = paramTypes.length;
 
         for (Wrapper w : wrappers) {
             Class<?>[] mParamTypes = w.getParameterTypes();
@@ -498,7 +491,7 @@ class Util {
 
     private static Class<?>[] getTypesFromValues(Object[] values) {
         if (values == null) {
-            return null;
+            return EMPTY_CLASS_ARRAY;
         }
 
         Class<?> result[] = new Class<?>[values.length];
@@ -569,12 +562,8 @@ class Util {
 
         List<Wrapper> wrappers = Wrapper.wrap(constructors);
 
-        Wrapper result = findWrapper(
-                clazz, wrappers, methodName, paramTypes, paramValues);
+        Wrapper result = findWrapper(clazz, wrappers, methodName, paramTypes, 
paramValues);
 
-        if (result == null) {
-            return null;
-        }
         return getConstructor(clazz, (Constructor<?>) result.unWrap());
     }
 



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org