- Fix improper caching by checking the class definition.

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

diff --git a/java/javax/el/BeanELResolver.java b/java/javax/el/BeanELResolver.java
index b947083..7a05331 100644 (file)
--- a/java/javax/el/BeanELResolver.java
+++ b/java/javax/el/BeanELResolver.java
@@ -194,6 +194,10 @@ public class BeanELResolver extends ELResolver {
                        }\r
                        return property;\r
                }\r
+        \r
+        public Class<?> getType() {\r
+            return type;\r
+        }\r
        }\r
 \r
        private final static class BeanProperty {\r
@@ -253,7 +257,7 @@ public class BeanELResolver extends ELResolver {
                String prop = property.toString();\r
 \r
                BeanProperties props = this.cache.get(type.getName());\r
-               if (props == null) {\r
+               if (props == null || type != props.getType()) {\r
                        props = new BeanProperties(type);\r
                        this.cache.put(type.getName(), props);\r
                }\r