You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by sv...@apache.org on 2017/06/07 18:06:30 UTC
wicket git commit: WICKET-6386 don't call isPageStateless()
prematurely
Repository: wicket
Updated Branches:
refs/heads/master d89357404 -> 3fd9c9836
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/3fd9c983
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/3fd9c983
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/3fd9c983
Branch: refs/heads/master
Commit: 3fd9c9836e5035ed18b75d31e589b6aeac1740e4
Parents: d893574
Author: Sven Meier <sv...@apache.org>
Authored: Wed Jun 7 19:56:51 2017 +0200
Committer: Sven Meier <sv...@apache.org>
Committed: Wed Jun 7 20:01:47 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/3fd9c983/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 c48942b..544fc34 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;