From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sat, 16 Jan 2010 10:50:12 +0000 (+0000)
Subject: Fix bug in Enum to Enum coercion spotted during code review
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=630dff741584a3f5c9bb0ef61dc6162463792fa6;p=tomcat7.0

Fix bug in Enum to Enum coercion spotted during code review

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

diff --git a/java/org/apache/el/lang/ELSupport.java b/java/org/apache/el/lang/ELSupport.java
index fe02816c2..f627aa342 100644
--- a/java/org/apache/el/lang/ELSupport.java
+++ b/java/org/apache/el/lang/ELSupport.java
@@ -178,11 +178,11 @@ public class ELSupport {
      * @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;