Repository: struts Updated Branches: refs/heads/master b465791dc -> d8284846d
WW-4788 Parameters which are added via ServletDispatcherResult aren't availabe in #parameters Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/d8284846 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/d8284846 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/d8284846 Branch: refs/heads/master Commit: d8284846db6d761ec456d6b495451efa684326ce Parents: b465791 Author: Aleksandr Mashchenko <amashche...@apache.org> Authored: Sat Apr 22 12:15:00 2017 +0300 Committer: Aleksandr Mashchenko <amashche...@apache.org> Committed: Sat Apr 22 12:15:00 2017 +0300 ---------------------------------------------------------------------- .../java/org/apache/struts2/result/ServletDispatcherResult.java | 2 ++ .../org/apache/struts2/result/ServletDispatcherResultTest.java | 2 ++ 2 files changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/d8284846/core/src/main/java/org/apache/struts2/result/ServletDispatcherResult.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/struts2/result/ServletDispatcherResult.java b/core/src/main/java/org/apache/struts2/result/ServletDispatcherResult.java index c3f7125..3322c64 100644 --- a/core/src/main/java/org/apache/struts2/result/ServletDispatcherResult.java +++ b/core/src/main/java/org/apache/struts2/result/ServletDispatcherResult.java @@ -148,6 +148,8 @@ public class ServletDispatcherResult extends StrutsResultSupport { if (queryParams != null && !queryParams.isEmpty()) { parameters = HttpParameters.create(queryParams).withParent(parameters).build(); invocation.getInvocationContext().setParameters(parameters); + // put to extraContext, see Dispatcher#createContextMap + invocation.getInvocationContext().getContextMap().put("parameters", parameters); } } http://git-wip-us.apache.org/repos/asf/struts/blob/d8284846/core/src/test/java/org/apache/struts2/result/ServletDispatcherResultTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/struts2/result/ServletDispatcherResultTest.java b/core/src/test/java/org/apache/struts2/result/ServletDispatcherResultTest.java index f2826b6..baabf29 100644 --- a/core/src/test/java/org/apache/struts2/result/ServletDispatcherResultTest.java +++ b/core/src/test/java/org/apache/struts2/result/ServletDispatcherResultTest.java @@ -33,6 +33,7 @@ import ognl.Ognl; import org.apache.struts2.ServletActionContext; import org.apache.struts2.StrutsInternalTestCase; import org.apache.struts2.StrutsStatics; +import org.apache.struts2.dispatcher.HttpParameters; import com.mockobjects.dynamic.C; import com.mockobjects.dynamic.Mock; @@ -148,6 +149,7 @@ public class ServletDispatcherResultTest extends StrutsInternalTestCase implemen assertTrue(mockActionInvocation.getInvocationContext().getParameters().contains("bar")); assertEquals("1", mockActionInvocation.getInvocationContext().getParameters().get("bar").getValue()); + assertEquals("1", ((HttpParameters) mockActionInvocation.getInvocationContext().getContextMap().get("parameters")).get("bar").getValue()); dispatcherMock.verify(); requestMock.verify(); dispatcherMock.verify();
