TCK failure. Wrong exception on failure.

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

diff --git a/java/org/apache/el/lang/ELSupport.java b/java/org/apache/el/lang/ELSupport.java
index 14a907a..fe02816 100644 (file)
--- a/java/org/apache/el/lang/ELSupport.java
+++ b/java/org/apache/el/lang/ELSupport.java
@@ -185,7 +185,14 @@ public class ELSupport {
         if (obj.getClass().isEnum()) {
             return (Enum<?>) obj;
         }
-        return Enum.valueOf(type, obj.toString());
+        Enum<?> result;
+        try {
+             result = Enum.valueOf(type, obj.toString());
+        } catch (IllegalArgumentException iae) {
+            throw new ELException(MessageFactory.get("error.convert",
+                    obj, obj.getClass(), type));
+        }
+        return result;
     }
 
     /**