Author: remy.maucherat(a)jboss.com
Date: 2009-12-14 17:51:27 -0500 (Mon, 14 Dec 2009)
New Revision: 1339
Modified:
trunk/java/org/apache/el/parser/AstValue.java
Log:
- Fix NPE regression.
Modified: trunk/java/org/apache/el/parser/AstValue.java
===================================================================
--- trunk/java/org/apache/el/parser/AstValue.java 2009-12-14 17:42:51 UTC (rev 1338)
+++ trunk/java/org/apache/el/parser/AstValue.java 2009-12-14 22:51:27 UTC (rev 1339)
@@ -126,7 +126,7 @@
if (this.children[i] instanceof AstDotSuffix) {
params = ((AstDotSuffix) this.children[i]).getParameters(ctx);
}
- if (params.length > 0) {
+ if (params != null && params.length > 0) {
ctx.setPropertyResolved(false);
base = resolver.invoke(ctx, base, property, null, params);
} else {
@@ -186,7 +186,7 @@
params = ((AstDotSuffix) this.children[1]).getParameters(ctx);
}
Object result = null;
- if (params.length > 0) {
+ if (params != null && params.length > 0) {
ELResolver resolver = ctx.getELResolver();
ctx.setPropertyResolved(false);
result = resolver.invoke(ctx, t.base, t.property, null, params);
Show replies by date