Author: markt
Date: Fri Mar 30 16:30:37 2012
New Revision: 1307511
URL: http://svn.apache.org/viewvc?rev=1307511&view=rev
Log:
Revert r758664 and the fix for bug 46915 since the bug is invalid since the EL
specification requires the behaviour that bug objects to.
Modified:
tomcat/trunk/java/javax/el/ResourceBundleELResolver.java
Modified: tomcat/trunk/java/javax/el/ResourceBundleELResolver.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/ResourceBundleELResolver.java?rev=1307511&r1=1307510&r2=1307511&view=diff
==============================================================================
--- tomcat/trunk/java/javax/el/ResourceBundleELResolver.java (original)
+++ tomcat/trunk/java/javax/el/ResourceBundleELResolver.java Fri Mar 30
16:30:37 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() + "???";
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
