Updated Branches: refs/heads/wicket-6.x d55e036fc -> 54305b626
WICKET-5486 WebPageRenderer should honor RedirectPolicy.ALWAYS_REDIRECT more consistently Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/54305b62 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/54305b62 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/54305b62 Branch: refs/heads/wicket-6.x Commit: 54305b6260e30950bc6262867c62d2f71617c758 Parents: d55e036 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Thu Jan 30 14:29:45 2014 +0100 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Thu Jan 30 14:29:45 2014 +0100 ---------------------------------------------------------------------- .../org/apache/wicket/request/handler/render/WebPageRenderer.java | 2 +- .../apache/wicket/request/handler/render/WebPageRendererTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/54305b62/wicket-core/src/main/java/org/apache/wicket/request/handler/render/WebPageRenderer.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/request/handler/render/WebPageRenderer.java b/wicket-core/src/main/java/org/apache/wicket/request/handler/render/WebPageRenderer.java index d27cab6..c641b58 100644 --- a/wicket-core/src/main/java/org/apache/wicket/request/handler/render/WebPageRenderer.java +++ b/wicket-core/src/main/java/org/apache/wicket/request/handler/render/WebPageRenderer.java @@ -207,7 +207,7 @@ public class WebPageRenderer extends PageRenderer .isPageStateless()) // || (targetUrl.equals(currentUrl) && isRedirectToRender()) // ) // - || shouldPreserveClientUrl) // + || (shouldPreserveClientUrl && getRedirectPolicy() != RedirectPolicy.ALWAYS_REDIRECT)) // ) // { // if the policy is never to redirect http://git-wip-us.apache.org/repos/asf/wicket/blob/54305b62/wicket-core/src/test/java/org/apache/wicket/request/handler/render/WebPageRendererTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/request/handler/render/WebPageRendererTest.java b/wicket-core/src/test/java/org/apache/wicket/request/handler/render/WebPageRendererTest.java index 005d56b..3c6ce7e 100644 --- a/wicket-core/src/test/java/org/apache/wicket/request/handler/render/WebPageRendererTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/request/handler/render/WebPageRendererTest.java @@ -349,7 +349,7 @@ public class WebPageRendererTest when(requestCycle.mapUrlFor(eq(handler))).thenReturn(Url.parse("base/a")); - when(request.shouldPreserveClientUrl()).thenReturn(false); + when(request.shouldPreserveClientUrl()).thenReturn(true); renderer.respond(requestCycle);
