Author: markt
Date: Tue Apr 28 11:16:00 2009
New Revision: 769336
URL: http://svn.apache.org/viewvc?rev=769336&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/tc6.0.x/trunk/ (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/javax/el/ResourceBundleELResolver.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc6.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 28 11:16:00 2009
@@ -1 +1 @@
-/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,747834,747863,748344,750258,750291,750921,751286-751287,751295,757774,758596,758616,768335
+/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,747834,747863,748344,750258,750291,750921,751286-751287,751295,757774,758596,758616,758664,768335
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=769336&r1=769335&r2=769336&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Apr 28 11:16:00 2009
@@ -104,15 +104,6 @@
+1: markt, remm
-1:
-* 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.
- http://svn.apache.org/viewvc?rev=758664&view=rev
- +1: markt, rjung, remm
- -1:
- rjung: r758664 (above URL) contains strange whitespace.
- Seems tabs are mixed with spaces.
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=41606
Prevent double init() of JSP
Patch provided by Chris Halstead
Modified: tomcat/tc6.0.x/trunk/java/javax/el/ResourceBundleELResolver.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/javax/el/ResourceBundleELResolver.java?rev=769336&r1=769335&r2=769336&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/javax/el/ResourceBundleELResolver.java (original)
+++ tomcat/tc6.0.x/trunk/java/javax/el/ResourceBundleELResolver.java Tue Apr 28
11:16:00 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() +
"???";
}
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=769336&r1=769335&r2=769336&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Tue Apr 28 11:16:00 2009
@@ -100,6 +100,10 @@
<fix>
<bug>46910</bug>: Properties files corrupted by build process. (remm)
</fix>
+ <fix>
+ <bug>46915</bug>: When resolving ResourceBundle properties, don't claim
+ to have resolved the property unless we really have resolved it.
(markt)
+ </fix>
</changelog>
</subsection>
</section>
@@ -658,7 +662,7 @@
Use more useful JPDA defaults in catalina.bat. (markt)
</fix>
<fix>
- Correct error in 25. web-app XSD.
+ Correct error in 2.5 web-app XSD.
</fix>
</changelog>
</subsection>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
