- For whatever reason, getValue is different, and must return null if the index given...

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@447473 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/javax/el/ArrayELResolver.java b/java/javax/el/ArrayELResolver.java
index d3cbf53..6569f43 100644 (file)
--- a/java/javax/el/ArrayELResolver.java
+++ b/java/javax/el/ArrayELResolver.java
@@ -42,8 +42,11 @@ public class ArrayELResolver extends ELResolver {
                if (base != null && base.getClass().isArray()) {
                        context.setPropertyResolved(true);
                        int idx = coerce(property);
-                       checkBounds(base, idx);
-                       return Array.get(base, idx);
+            if (idx < 0 || idx >= Array.getLength(base)) {
+                return null;
+            } else {
+                return Array.get(base, idx);
+            }
                }
 
                return null;