svn commit: r766360 - in /struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/filter: StrutsPrepareAndExecuteFilter.java StrutsPrepareFilter.java

[musachy]

Author: musachy
Date: Sat Apr 18 17:23:53 2009
New Revision: 766360

URL: http://svn.apache.org/viewvc?rev=766360&view=rev
Log:
WW-3075 StrutsPrepareAndExecuteFilter accesses request parameters before 
setting request encoding

patch provided by Roman Shevchenko

Modified:
    
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/filter/StrutsPrepareAndExecuteFilter.java
    
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/filter/StrutsPrepareFilter.java

Modified: 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/filter/StrutsPrepareAndExecuteFilter.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/filter/StrutsPrepareAndExecuteFilter.java?rev=766360&r1=766359&r2=766360&view=diff
==============================================================================
--- 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/filter/StrutsPrepareAndExecuteFilter.java
 (original)
+++ 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/filter/StrutsPrepareAndExecuteFilter.java
 Sat Apr 18 17:23:53 2009
@@ -62,9 +62,9 @@
         HttpServletResponse response = (HttpServletResponse) res;
 
         try {
+            prepare.setEncodingAndLocale(request, response);
             prepare.createActionContext(request, response);
             prepare.assignDispatcherToThread();
-            prepare.setEncodingAndLocale(request, response);
             request = prepare.wrapRequest(request);
             ActionMapping mapping = prepare.findActionMapping(request, 
response, true);
             if (mapping == null) {

Modified: 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/filter/StrutsPrepareFilter.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/filter/StrutsPrepareFilter.java?rev=766360&r1=766359&r2=766360&view=diff
==============================================================================
--- 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/filter/StrutsPrepareFilter.java
 (original)
+++ 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/filter/StrutsPrepareFilter.java
 Sat Apr 18 17:23:53 2009
@@ -56,9 +56,9 @@
         HttpServletResponse response = (HttpServletResponse) res;
 
         try {
+            prepare.setEncodingAndLocale(request, response);
             prepare.createActionContext(request, response);
             prepare.assignDispatcherToThread();
-            prepare.setEncodingAndLocale(request, response);
             request = prepare.wrapRequest(request);
             prepare.findActionMapping(request, response);