You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by he...@apache.org on 2018/01/21 10:25:46 UTC
svn commit: r1821779 -
/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/introspection/MethodKey.java
Author: henrib
Date: Sun Jan 21 10:25:46 2018
New Revision: 1821779
URL: http://svn.apache.org/viewvc?rev=1821779&view=rev
Log:
JEXL:
Protect against potential NPE
Modified:
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/introspection/MethodKey.java
Modified: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/introspection/MethodKey.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/introspection/MethodKey.java?rev=1821779&r1=1821778&r2=1821779&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/introspection/MethodKey.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/introspection/MethodKey.java Sun Jan 21 10:25:46 2018
@@ -373,7 +373,7 @@ public final class MethodKey {
return true;
}
/* system asssignable, both sides must be array or not */
- if (formal.isAssignableFrom(actual) && (actual != null && actual.isArray() == formal.isArray())) {
+ if (actual != null && formal.isAssignableFrom(actual) && actual.isArray() == formal.isArray()) {
return true;
}
/** catch all... */