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/02/17 07:38:23 UTC

struts git commit: WW-4465 Ignores statusCode parameter when building redirect url

Repository: struts
Updated Branches:
  refs/heads/develop fbe7d5138 -> c5867e2ea


WW-4465 Ignores statusCode parameter when building redirect url


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

Branch: refs/heads/develop
Commit: c5867e2ea2c72864730c77167b9827e49c0cd38f
Parents: fbe7d51
Author: Lukasz Lenart <lu...@apache.org>
Authored: Tue Feb 17 07:38:13 2015 +0100
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Tue Feb 17 07:38:13 2015 +0100

----------------------------------------------------------------------
 .../dispatcher/ServletActionRedirectResult.java        | 13 ++++++++++++-
 .../dispatcher/ServletActionRedirectResultTest.java    |  3 ++-
 2 files changed, 14 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/struts/blob/c5867e2e/core/src/main/java/org/apache/struts2/dispatcher/ServletActionRedirectResult.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/dispatcher/ServletActionRedirectResult.java b/core/src/main/java/org/apache/struts2/dispatcher/ServletActionRedirectResult.java
index b41c06e..5e0f835 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/ServletActionRedirectResult.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/ServletActionRedirectResult.java
@@ -210,7 +210,18 @@ public class ServletActionRedirectResult extends ServletRedirectResult implement
     }
 
     protected List<String> getProhibitedResultParams() {
-        return Arrays.asList(DEFAULT_PARAM, "namespace", "method", "encode", "parse", "location", "prependServletContext", "suppressEmptyParameters", "anchor");
+        return Arrays.asList(
+                DEFAULT_PARAM,
+                "namespace",
+                "method",
+                "encode",
+                "parse",
+                "location",
+                "prependServletContext",
+                "suppressEmptyParameters",
+                "anchor",
+                "statusCode"
+        );
     }
 
 }

http://git-wip-us.apache.org/repos/asf/struts/blob/c5867e2e/core/src/test/java/org/apache/struts2/dispatcher/ServletActionRedirectResultTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/struts2/dispatcher/ServletActionRedirectResultTest.java b/core/src/test/java/org/apache/struts2/dispatcher/ServletActionRedirectResultTest.java
index a679919..168ea04 100644
--- a/core/src/test/java/org/apache/struts2/dispatcher/ServletActionRedirectResultTest.java
+++ b/core/src/test/java/org/apache/struts2/dispatcher/ServletActionRedirectResultTest.java
@@ -58,7 +58,8 @@ public class ServletActionRedirectResultTest extends StrutsInternalTestCase {
             .addParam("location", "someLocation")
             .addParam("prependServletContext", "true")
             .addParam("method", "someMethod")
-            .addParam("param1", "${#value1}")
+			.addParam("statusCode", "333")
+			.addParam("param1", "${#value1}")
             .addParam("param2", "${#value2}")
             .addParam("param3", "${#value3}")
             .addParam("anchor", "${#fragment}")