Author: violetagg Date: Wed May 3 20:47:41 2017 New Revision: 1793712 URL: http://svn.apache.org/viewvc?rev=1793712&view=rev Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=61065 Ensure that once the class is resolved by it will be cached with the proper name.
Modified: tomcat/trunk/java/javax/el/ImportHandler.java tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/java/javax/el/ImportHandler.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/ImportHandler.java?rev=1793712&r1=1793711&r2=1793712&view=diff ============================================================================== --- tomcat/trunk/java/javax/el/ImportHandler.java (original) +++ tomcat/trunk/java/javax/el/ImportHandler.java Wed May 3 20:47:41 2017 @@ -152,7 +152,7 @@ public class ImportHandler { if (className != null) { Class<?> clazz = findClass(className, true); if (clazz != null) { - clazzes.put(className, clazz); + clazzes.put(name, clazz); return clazz; } } Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1793712&r1=1793711&r2=1793712&view=diff ============================================================================== --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Wed May 3 20:47:41 2017 @@ -135,6 +135,11 @@ bytes used to detect the encoding since they are not part of a BOM. (markt) </fix> + <fix> + <bug>61065</bug>: Ensure that once the class is resolved by + <code>javax.el.ImportHandler#resolveClass</code> it will be cached with + the proper name. (violetagg) + </fix> </changelog> </subsection> <subsection name="WebSocket"> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org