From: remm <remm@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 13 Sep 2006 13:38:25 +0000 (+0000)
Subject: - Fix ArrayELResolver.coerce when using a String.
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=9a940e3c0bfd94cf94608e22cf3748aae2fe01c7;p=tomcat7.0

- 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 28dcc8270..d3cbf5321 100644
--- 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 36d55d87a..d324efeea 100644
--- 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 7ce0d10b3..0affb5c69 100644
--- 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;