You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by ad...@apache.org on 2015/07/07 17:50:41 UTC
wicket git commit: Revert "WICKET-5933 Avoid serialization of
untouched page after ajax request"
Repository: wicket
Updated Branches:
refs/heads/master d24a47e5e -> d4c7cdbe7
Revert "WICKET-5933 Avoid serialization of untouched page after ajax request"
This reverts commit 127ec84f300166dc2315eb8d36f3c275850d24a2.
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/d4c7cdbe
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/d4c7cdbe
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/d4c7cdbe
Branch: refs/heads/master
Commit: d4c7cdbe7b62534ca537d175fc4a23f0ed56125b
Parents: d24a47e
Author: Andrea Del Bene <ad...@apache.org>
Authored: Tue Jul 7 11:20:03 2015 +0200
Committer: Andrea Del Bene <ad...@apache.org>
Committed: Tue Jul 7 17:41:33 2015 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/wicket/Page.java | 7 ++-----
.../org/apache/wicket/markup/html/WebPage.java | 18 +++++++-----------
.../apache/wicket/page/AbstractPageManager.java | 7 ++++++-
3 files changed, 15 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/d4c7cdbe/wicket-core/src/main/java/org/apache/wicket/Page.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/Page.java b/wicket-core/src/main/java/org/apache/wicket/Page.java
index bc4538a..0935942 100644
--- a/wicket-core/src/main/java/org/apache/wicket/Page.java
+++ b/wicket-core/src/main/java/org/apache/wicket/Page.java
@@ -284,7 +284,7 @@ public abstract class Page extends MarkupContainer
isInitialization))
{
setFlag(FLAG_IS_DIRTY, true);
- setNextAvailableId(isInitialization);
+ setNextAvailableId();
if (isInitialization == false)
{
@@ -722,12 +722,9 @@ public abstract class Page extends MarkupContainer
}
/**
- * Increments the version id of the page
*
- * @param isInitialization
- * tells if the page has been newly instantiated
*/
- protected void setNextAvailableId(boolean isInitialization)
+ private void setNextAvailableId()
{
setNumericId(getSession().nextPageId());
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/d4c7cdbe/wicket-core/src/main/java/org/apache/wicket/markup/html/WebPage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/WebPage.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/WebPage.java
index cbd418b..05feebb 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/WebPage.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/WebPage.java
@@ -18,7 +18,6 @@ package org.apache.wicket.markup.html;
import org.apache.wicket.Component;
import org.apache.wicket.Page;
-import org.apache.wicket.core.request.handler.IPageRequestHandler;
import org.apache.wicket.markup.MarkupType;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.internal.HtmlHeaderContainer;
@@ -31,6 +30,7 @@ import org.apache.wicket.request.IRequestHandler;
import org.apache.wicket.request.Request;
import org.apache.wicket.request.Response;
import org.apache.wicket.request.cycle.RequestCycle;
+import org.apache.wicket.core.request.handler.IPageRequestHandler;
import org.apache.wicket.request.http.WebRequest;
import org.apache.wicket.request.http.WebResponse;
import org.apache.wicket.request.mapper.parameter.PageParameters;
@@ -324,23 +324,19 @@ public class WebPage extends Page
{
return new BookmarkablePageLink<>(id, getApplication().getHomePage());
}
-
+
/**
- * THIS METHOD IS NOT PART OF THE WICKET PUBLIC API. DO NOT CALL OR OVERRIDE.
- *
- * Don't increment page version during AJAX requests.
- * Do it only if page is new.
+ * Prevents page from get dirty inside an AJAX request.
*/
@Override
- protected final void setNextAvailableId(boolean isInitialization)
+ public final void dirty(boolean isInitialization)
{
Request request = getRequest();
- if (request instanceof WebRequest && ((WebRequest)request).isAjax()
- && !isInitialization)
+ if (isInitialization == false && request instanceof WebRequest &&
+ ((WebRequest)request).isAjax())
{
return;
}
-
- super.setNextAvailableId(isInitialization);
+ super.dirty(isInitialization);
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/d4c7cdbe/wicket-core/src/main/java/org/apache/wicket/page/AbstractPageManager.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/page/AbstractPageManager.java b/wicket-core/src/main/java/org/apache/wicket/page/AbstractPageManager.java
index 30bfd08..fc1132b 100644
--- a/wicket-core/src/main/java/org/apache/wicket/page/AbstractPageManager.java
+++ b/wicket-core/src/main/java/org/apache/wicket/page/AbstractPageManager.java
@@ -79,7 +79,12 @@ public abstract class AbstractPageManager implements IPageManager
@Override
public IManageablePage getPage(int id)
{
- return getRequestAdapter().getPage(id);
+ IManageablePage page = getRequestAdapter().getPage(id);
+ if (page != null)
+ {
+ touchPage(page);
+ }
+ return page;
}
@Override