Author: markt
Date: Fri Dec 28 13:19:20 2007
New Revision: 607334
URL: http://svn.apache.org/viewvc?rev=607334&view=rev
Log:
Fix 43909. Make sure locale maps to wrapped ELContext. Patch provided by Tuomas
Kiviaho.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/el/lang/EvaluationContext.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=607334&r1=607333&r2=607334&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Dec 28 13:19:20 2007
@@ -60,12 +60,6 @@
+1: markt,funkman, yoavs
-1:
-* Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43909
- Make sure locale maps to wrapped ELContext. Patch provided by Tuomas Kiviaho.
- http://svn.apache.org/viewvc?rev=606728&view=rev
- +1: markt,funkman, yoavs
- -1:
-
* Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=42503
ServletContext.getResourceAsStream returns stale data
http://svn.apache.org/viewvc?rev=606994&view=rev
Modified: tomcat/tc6.0.x/trunk/java/org/apache/el/lang/EvaluationContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/el/lang/EvaluationContext.java?rev=607334&r1=607333&r2=607334&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/el/lang/EvaluationContext.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/el/lang/EvaluationContext.java Fri Dec
28 13:19:20 2007
@@ -17,6 +17,8 @@
package org.apache.el.lang;
+import java.util.Locale;
+
import javax.el.ELContext;
import javax.el.ELResolver;
import javax.el.FunctionMapper;
@@ -67,5 +69,13 @@
public void setPropertyResolved(boolean resolved) {
this.elContext.setPropertyResolved(resolved);
+ }
+
+ public Locale getLocale() {
+ return this.elContext.getLocale();
+ }
+
+ public void setLocale(Locale locale) {
+ this.elContext.setLocale(locale);
}
}
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=607334&r1=607333&r2=607334&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Fri Dec 28 13:19:20 2007
@@ -115,6 +115,15 @@
<bug>43622</bug>: Don't overwrite the min compression size set by the
compression attribute with the default. (markt/jim)
</fix>
+ <fix>
+ <bug>43839</bug>: URL based session tracking failed when a session
+ cookie from a parent context was present. Based on a patch by Yuan
+ Qingyun. (markt)
+ </fix>
+ <fix>
+ <bug>43914</bug>: URLs in location headers should be encoded. Patch
+ provided by Ivan Todoroski. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Jasper">
@@ -133,13 +142,8 @@
a scriptlet there is a one to one line mapping. (markt/jim)
</fix>
<fix>
- <bug>43839</bug>: URL based session tracking failed when a session
- cookie from a parent context was present. Based on a patch by Yuan
- Qingyun. (markt)
- </fix>
- <fix>
- <bug>43914</bug>: URLs in location headers should be encoded. Patch
- provided by Ivan Todoroski. (markt)
+ <bug>43909</bug>: Make sure locale maps to wrapped ELContext. Patch
+ provided by Tuomas Kiviaho. (markt)
</fix>
</changelog>
</subsection>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
