Author: markt Date: Fri Mar 30 16:33:49 2012 New Revision: 1307514 URL: http://svn.apache.org/viewvc?rev=1307514&view=rev Log: (empty)
Added: tomcat/tc7.0.x/trunk/test/javax/el/TestResourceBundleELResolver.java - copied unchanged from r1307512, tomcat/trunk/test/javax/el/TestResourceBundleELResolver.java Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/javax/el/ResourceBundleELResolver.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ ------------------------------------------------------------------------------ Merged /tomcat/trunk:r1307511-1307512 Modified: tomcat/tc7.0.x/trunk/java/javax/el/ResourceBundleELResolver.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/javax/el/ResourceBundleELResolver.java?rev=1307514&r1=1307513&r2=1307514&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/javax/el/ResourceBundleELResolver.java (original) +++ tomcat/tc7.0.x/trunk/java/javax/el/ResourceBundleELResolver.java Fri Mar 30 16:33:49 2012 @@ -33,18 +33,20 @@ public class ResourceBundleELResolver ex @Override public Object getValue(ELContext context, Object base, Object property) - throws NullPointerException, PropertyNotFoundException, ELException { + throws NullPointerException, PropertyNotFoundException, + ELException { + if (context == null) { throw new NullPointerException(); } if (base instanceof ResourceBundle) { + context.setPropertyResolved(true); + if (property != null) { try { - Object result = ((ResourceBundle) base).getObject(property + return ((ResourceBundle) base).getObject(property .toString()); - context.setPropertyResolved(true); - return result; } catch (MissingResourceException mre) { return "???" + property.toString() + "???"; } Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1307514&r1=1307513&r2=1307514&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Fri Mar 30 16:33:49 2012 @@ -213,6 +213,11 @@ <bug>52970</bug>: Take account of coercion rules when invoking methods via EL. (markt) </fix> + <fix> + <bug>53001</bug>: Revert the fix for <bug>46915</bug> since the use case + described in the bug is invalid since it breaks the EL specification. + (markt) + </fix> </changelog> </subsection> <subsection name="Cluster"> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org