- Fix ArrayELResolver.coerce when using a String.

- Some cleanups.

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

diff --git a/java/javax/el/ArrayELResolver.java b/java/javax/el/ArrayELResolver.java
index 28dcc82..d3cbf53 100644 (file)
--- a/java/javax/el/ArrayELResolver.java
+++ b/java/javax/el/ArrayELResolver.java
@@ -145,6 +145,9 @@ public class ArrayELResolver extends ELResolver {
                if (property instanceof Boolean) {
                        return (((Boolean) property).booleanValue() ? 1 : 0);
                }
+        if (property instanceof String) {
+            return Integer.parseInt((String) property);
+        }
                throw new IllegalArgumentException(property != null ? property
                                .toString() : "null");
        }

diff --git a/java/javax/el/ListELResolver.java b/java/javax/el/ListELResolver.java
index 36d55d8..d324efe 100644 (file)
--- a/java/javax/el/ListELResolver.java
+++ b/java/javax/el/ListELResolver.java
@@ -17,7 +17,6 @@
 package javax.el;
 
 import java.beans.FeatureDescriptor;
-import java.lang.reflect.Array;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;

diff --git a/java/javax/el/ResourceBundleELResolver.java b/java/javax/el/ResourceBundleELResolver.java
index 7ce0d10..0affb5c 100644 (file)
--- a/java/javax/el/ResourceBundleELResolver.java
+++ b/java/javax/el/ResourceBundleELResolver.java
@@ -94,9 +94,9 @@ public class ResourceBundleELResolver extends ELResolver {
                return true;
        }
 
-       public Iterator getFeatureDescriptors(ELContext context, Object base) {
+       public Iterator<FeatureDescriptor> getFeatureDescriptors(ELContext context, Object base) {
                if (base instanceof ResourceBundle) {
-                       List feats = new ArrayList();
+                       List<FeatureDescriptor> feats = new ArrayList<FeatureDescriptor>();
                        Enumeration e = ((ResourceBundle) base).getKeys();
                        FeatureDescriptor feat;
                        String key;