You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2015/10/20 08:40:40 UTC
[1/2] struts git commit: Drops unused code
Repository: struts
Updated Branches:
refs/heads/support-2-3 3e2d5da12 -> f65e38bb8
Drops unused code
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/412684bd
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/412684bd
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/412684bd
Branch: refs/heads/support-2-3
Commit: 412684bd22e479ae063bee4df8bb434ddef40bcd
Parents: 3e2d5da
Author: Lukasz Lenart <lu...@gmail.com>
Authored: Tue Oct 20 08:39:39 2015 +0200
Committer: Lukasz Lenart <lu...@gmail.com>
Committed: Tue Oct 20 08:39:39 2015 +0200
----------------------------------------------------------------------
.../struts2/interceptor/ExecuteAndWaitInterceptor.java | 13 -------------
1 file changed, 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/412684bd/core/src/main/java/org/apache/struts2/interceptor/ExecuteAndWaitInterceptor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/interceptor/ExecuteAndWaitInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/ExecuteAndWaitInterceptor.java
index 7d8b542..fe96fe0 100644
--- a/core/src/main/java/org/apache/struts2/interceptor/ExecuteAndWaitInterceptor.java
+++ b/core/src/main/java/org/apache/struts2/interceptor/ExecuteAndWaitInterceptor.java
@@ -192,12 +192,6 @@ public class ExecuteAndWaitInterceptor extends MethodFilterInterceptor {
this.container = container;
}
- /* (non-Javadoc)
- * @see com.opensymphony.xwork2.interceptor.Interceptor#init()
- */
- public void init() {
- }
-
/**
* Creates a new background process
*
@@ -303,13 +297,6 @@ public class ExecuteAndWaitInterceptor extends MethodFilterInterceptor {
}
}
-
- /* (non-Javadoc)
- * @see com.opensymphony.xwork2.interceptor.Interceptor#destroy()
- */
- public void destroy() {
- }
-
/**
* Performs the initial delay.
* <p/>
[2/2] struts git commit: WW-3161 Sets proper ActionContext to allow
I18N to work
Posted by lu...@apache.org.
WW-3161 Sets proper ActionContext to allow I18N to work
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/f65e38bb
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/f65e38bb
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/f65e38bb
Branch: refs/heads/support-2-3
Commit: f65e38bb815e98f65cb4ee987aba4ca360b408dd
Parents: 412684b
Author: Lukasz Lenart <lu...@gmail.com>
Authored: Tue Oct 20 08:40:25 2015 +0200
Committer: Lukasz Lenart <lu...@gmail.com>
Committed: Tue Oct 20 08:40:25 2015 +0200
----------------------------------------------------------------------
.../java/org/apache/struts2/interceptor/BackgroundProcess.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/f65e38bb/core/src/main/java/org/apache/struts2/interceptor/BackgroundProcess.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/interceptor/BackgroundProcess.java b/core/src/main/java/org/apache/struts2/interceptor/BackgroundProcess.java
index 79ad017..c8061a3 100644
--- a/core/src/main/java/org/apache/struts2/interceptor/BackgroundProcess.java
+++ b/core/src/main/java/org/apache/struts2/interceptor/BackgroundProcess.java
@@ -23,6 +23,7 @@ package org.apache.struts2.interceptor;
import java.io.Serializable;
+import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionInvocation;
/**
@@ -78,6 +79,7 @@ public class BackgroundProcess implements Serializable {
* @throws Exception any exception thrown will be thrown, in turn, by the ExecuteAndWaitInterceptor
*/
protected void beforeInvocation() throws Exception {
+ ActionContext.setContext(invocation.getInvocationContext());
}
/**
@@ -88,6 +90,7 @@ public class BackgroundProcess implements Serializable {
* @throws Exception any exception thrown will be thrown, in turn, by the ExecuteAndWaitInterceptor
*/
protected void afterInvocation() throws Exception {
+ ActionContext.setContext(null);
}
/**