From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sat, 16 Jan 2010 10:37:31 +0000 (+0000)
Subject: TCK failure. Wrong exception on failure.
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=3a13cb7b8ae3fc196f7ff8473925b76515912094;p=tomcat7.0

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 14a907a48..fe02816c2 100644
--- 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;
     }
 
     /**