Repository: wicket Updated Branches: refs/heads/wicket-7.x d0aab2085 -> 348462994
WICKET-6386 don't call isPageStateless() prematurely Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/34846299 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/34846299 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/34846299 Branch: refs/heads/wicket-7.x Commit: 3484629946341cdfca9bb0467ab54af7accc95ea Parents: d0aab20 Author: Sven Meier <[email protected]> Authored: Wed Jun 7 19:56:51 2017 +0200 Committer: Sven Meier <[email protected]> Committed: Wed Jun 7 19:56:51 2017 +0200 ---------------------------------------------------------------------- .../wicket/request/handler/render/WebPageRenderer.java | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/34846299/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 a59e585..6090df0 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 @@ -329,16 +329,10 @@ public class WebPageRenderer extends PageRenderer return (compatibleProtocols(currentUrl.getProtocol(), targetUrl.getProtocol())) && (neverRedirect(getRedirectPolicy()) || ((isOnePassRender() && notForcedRedirect(getRedirectPolicy())) || (targetUrl - .equals(currentUrl) && notNewAndNotStatelessPage(isNewPageInstance(), - isPageStateless()))) || (targetUrl.equals(currentUrl) && isRedirectToRender()) + .equals(currentUrl) && (!isNewPageInstance() && !isPageStateless()))) || (targetUrl.equals(currentUrl) && isRedirectToRender()) || (shouldPreserveClientUrl(cycle) && notForcedRedirect(getRedirectPolicy()))); } - private static boolean notNewAndNotStatelessPage(boolean newPageInstance, boolean pageStateless) - { - return !newPageInstance && !pageStateless; - } - private static boolean neverRedirect(RedirectPolicy redirectPolicy) { return redirectPolicy == RedirectPolicy.NEVER_REDIRECT;
