Author: markt
Date: Sat Jan 16 10:50:12 2010
New Revision: 899919
URL: http://svn.apache.org/viewvc?rev=899919&view=rev
Log:
Fix bug in Enum to Enum coercion spotted during code review
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=899919&r1=899918&r2=899919&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:50:12 2010
@@ -178,11 +178,11 @@
* @param type
* @return
*/
- public final static Enum coerceToEnum(final Object obj, Class type) {
+ public final static Enum<?> coerceToEnum(final Object obj, Class type) {
if (obj == null || "".equals(obj)) {
return null;
}
- if (obj.getClass().isEnum()) {
+ if (type.isAssignableFrom(obj.getClass())) {
return (Enum<?>) obj;
}
Enum<?> result;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
