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

[musachy]

Author: musachy
Date: Fri Aug 21 18:36:40 2009
New Revision: 806670

URL: http://svn.apache.org/viewvc?rev=806670&view=rev
Log:
WW-3227 struts.action.excludePattern does not work as expected

thanks to Andreas Joseph Krogh for the patch

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=806670&r1=806669&r2=806670&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
 Fri Aug 21 18:36:40 2009
@@ -77,10 +77,10 @@
             prepare.setEncodingAndLocale(request, response);
             prepare.createActionContext(request, response);
             prepare.assignDispatcherToThread();
-            request = prepare.wrapRequest(request);
                        if ( excludedPatterns != null && 
prepare.isUrlExcluded(request, excludedPatterns)) {
                                chain.doFilter(request, response);
                        } else {
+                               request = prepare.wrapRequest(request);
                                ActionMapping mapping = 
prepare.findActionMapping(request, response, true);
                                if (mapping == null) {
                                        boolean handled = 
execute.executeStaticResourceRequest(request, response);

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=806670&r1=806669&r2=806670&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
 Fri Aug 21 18:36:40 2009
@@ -73,10 +73,10 @@
             prepare.setEncodingAndLocale(request, response);
             prepare.createActionContext(request, response);
             prepare.assignDispatcherToThread();
-            request = prepare.wrapRequest(request);
                        if ( excludedPatterns != null && 
prepare.isUrlExcluded(request, excludedPatterns)) {
                                
request.setAttribute(REQUEST_EXCLUDED_FROM_ACTION_MAPPING, new Object());
                        } else {
+                               request = prepare.wrapRequest(request);
                                prepare.findActionMapping(request, response);
                        }
             chain.doFilter(request, response);
@@ -88,4 +88,4 @@
        public void destroy() {
         prepare.cleanupDispatcher();
     }
-}
\ No newline at end of file
+}