Author: markt
Date: Sat Jan 16 10:37:31 2010
New Revision: 899916
URL: http://svn.apache.org/viewvc?rev=899916&view=rev
Log:
TCK failure. Wrong exception on failure.
Modified:
tomcat/trunk/java/org/apache/el/lang/ELSupport.java
Modified: tomcat/trunk/java/org/apache/el/lang/ELSupport.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/lang/ELSupport.java?rev=899916&r1=899915&r2=899916&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/lang/ELSupport.java (original)
+++ tomcat/trunk/java/org/apache/el/lang/ELSupport.java Sat Jan 16 10:37:31 2010
@@ -185,7 +185,14 @@
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;
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
