You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by kk...@apache.org on 2012/05/28 20:44:19 UTC
svn commit: r1343356 - in /tomcat/tc6.0.x/trunk: STATUS.txt
java/javax/el/ResourceBundleELResolver.java webapps/docs/changelog.xml
Author: kkolinko
Date: Mon May 28 18:44:19 2012
New Revision: 1343356
URL: http://svn.apache.org/viewvc?rev=1343356&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53001
Revert the fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=46915 (r769336)
since the use case described in bug 46915 is invalid as it breaks the EL
specification.
Modified:
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
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1343356&r1=1343355&r2=1343356&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon May 28 18:44:19 2012
@@ -166,15 +166,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: markt, kkolinko, kfujino
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53001
- Revert the fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=46915
- since the use case described in bug 46915 is invalid as it breaks the EL
- specification.
- http://svn.apache.org/viewvc?rev=1307511&view=rev
- (The revision to revert in 6.0.x is r769336)
- +1: markt, kkolinko, kfujino
- -1:
-
* Fix several trivial HTML markup errors in example servlets
e.g. duplicate <body> tag preceding <head> and <tr> following </table>
http://people.apache.org/~kkolinko/patches/2012-05-13_tc6_sampleservlets.patch
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=1343356&r1=1343355&r2=1343356&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/javax/el/ResourceBundleELResolver.java (original)
+++ tomcat/tc6.0.x/trunk/java/javax/el/ResourceBundleELResolver.java Mon May 28 18:44:19 2012
@@ -38,12 +38,12 @@ public class ResourceBundleELResolver ex
}
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/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1343356&r1=1343355&r2=1343356&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Mon May 28 18:44:19 2012
@@ -146,6 +146,11 @@
<bug>52666</bug>: Correct coercion order in EL when processing the
equality and inequality operators. (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-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org