You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by cn...@apache.org on 2015/10/12 13:27:48 UTC
struts git commit: added changes from PRs #54 and #55 which have been
merged to master (also see WW-4552 and WW-4553)
Repository: struts
Updated Branches:
refs/heads/support-2-3 30d30e07d -> d15424ee5
added changes from PRs #54 and #55 which have been merged to master (also see WW-4552 and WW-4553)
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/d15424ee
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/d15424ee
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/d15424ee
Branch: refs/heads/support-2-3
Commit: d15424ee5f088fea138ed33a5c22631b331cc630
Parents: 30d30e0
Author: Christoph Nenning <cn...@apache.org>
Authored: Mon Oct 12 13:27:22 2015 +0200
Committer: Christoph Nenning <cn...@apache.org>
Committed: Mon Oct 12 13:27:22 2015 +0200
----------------------------------------------------------------------
.../java/com/opensymphony/xwork2/DefaultActionInvocation.java | 4 ++++
.../com/opensymphony/xwork2/DefaultActionProxyFactory.java | 6 +++++-
2 files changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/d15424ee/xwork-core/src/main/java/com/opensymphony/xwork2/DefaultActionInvocation.java
----------------------------------------------------------------------
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/DefaultActionInvocation.java b/xwork-core/src/main/java/com/opensymphony/xwork2/DefaultActionInvocation.java
index 1bf7ccf..e3e13f3 100644
--- a/xwork-core/src/main/java/com/opensymphony/xwork2/DefaultActionInvocation.java
+++ b/xwork-core/src/main/java/com/opensymphony/xwork2/DefaultActionInvocation.java
@@ -402,6 +402,10 @@ public class DefaultActionInvocation implements ActionInvocation {
invocationContext = new ActionContext(contextMap);
invocationContext.setName(proxy.getActionName());
+ createInterceptors(proxy);
+ }
+
+ protected void createInterceptors(ActionProxy proxy) {
// get a new List so we don't get problems with the iterator if someone changes the list
List<InterceptorMapping> interceptorList = new ArrayList<InterceptorMapping>(proxy.getConfig().getInterceptors());
interceptors = interceptorList.iterator();
http://git-wip-us.apache.org/repos/asf/struts/blob/d15424ee/xwork-core/src/main/java/com/opensymphony/xwork2/DefaultActionProxyFactory.java
----------------------------------------------------------------------
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/DefaultActionProxyFactory.java b/xwork-core/src/main/java/com/opensymphony/xwork2/DefaultActionProxyFactory.java
index 5c7db7a..4e4df2d 100644
--- a/xwork-core/src/main/java/com/opensymphony/xwork2/DefaultActionProxyFactory.java
+++ b/xwork-core/src/main/java/com/opensymphony/xwork2/DefaultActionProxyFactory.java
@@ -53,11 +53,15 @@ public class DefaultActionProxyFactory implements ActionProxyFactory {
public ActionProxy createActionProxy(String namespace, String actionName, String methodName, Map<String, Object> extraContext, boolean executeResult, boolean cleanupContext) {
- ActionInvocation inv = new DefaultActionInvocation(extraContext, true);
+ ActionInvocation inv = createActionInvocation(extraContext, true);
container.inject(inv);
return createActionProxy(inv, namespace, actionName, methodName, executeResult, cleanupContext);
}
+ protected ActionInvocation createActionInvocation(Map<String, Object> extraContext, boolean pushAction) {
+ return new DefaultActionInvocation(extraContext, pushAction);
+ }
+
public ActionProxy createActionProxy(ActionInvocation inv, String namespace, String actionName, boolean executeResult, boolean cleanupContext) {
return createActionProxy(inv, namespace, actionName, null, executeResult, cleanupContext);