Author: markt
Date: Thu Mar 26 14:28:11 2009
New Revision: 758664
URL: http://svn.apache.org/viewvc?rev=758664&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46915
When resolving ResourceBundle properties, don't claim to have resolved the
property unless we really have resolved it.
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=758664&r1=758663&r2=758664&view=diff
==============================================================================
--- tomcat/trunk/java/javax/el/ResourceBundleELResolver.java (original)
+++ tomcat/trunk/java/javax/el/ResourceBundleELResolver.java Thu Mar 26
14:28:11 2009
@@ -38,12 +38,12 @@
}
if (base instanceof ResourceBundle) {
- context.setPropertyResolved(true);
-
if (property != null) {
try {
- return ((ResourceBundle)
base).getObject(property
+ Object result = ((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]
