struts-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lukaszlen...@apache.org
Subject [4/9] git commit: Uses the new versions of methods without ServletContext
Date Mon, 17 Feb 2014 08:36:26 GMT
Uses the new versions of methods without ServletContext


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/a2e97a9c
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/a2e97a9c
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/a2e97a9c

Branch: refs/heads/feature/WW-4292-dont-use-servletcontext
Commit: a2e97a9ca41aeb9b6c8be68744dccb0b8c67f81d
Parents: ba0eda0
Author: Lukasz Lenart <lukaszlenart@apache.org>
Authored: Mon Feb 17 09:32:42 2014 +0100
Committer: Lukasz Lenart <lukaszlenart@apache.org>
Committed: Mon Feb 17 09:32:42 2014 +0100

----------------------------------------------------------------------
 .../java/org/apache/struts2/dispatcher/FilterDispatcher.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/struts/blob/a2e97a9c/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java b/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java
index 970311c..22fc051 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java
@@ -361,7 +361,7 @@ public class FilterDispatcher implements StrutsStatics, Filter {
         try {
             // Wrap request first, just in case it is multipart/form-data
             // parameters might not be accessible through before encoding (ww-1278)
-            request = dispatcher.wrapRequest(request, getServletContext());
+            request = dispatcher.wrapRequest(request);
         } catch (IOException e) {
             String message = "Could not wrap servlet request with MultipartRequestWrapper!";
             log.error(message, e);
@@ -431,7 +431,7 @@ public class FilterDispatcher implements StrutsStatics, Filter {
                 return;
             }
 
-            dispatcher.serviceAction(request, response, servletContext, mapping);
+            dispatcher.serviceAction(request, response, mapping);
 
         } finally {
             dispatcher.cleanUpRequest(request);


Mime
View raw message