You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2014/02/11 20:32:53 UTC
git commit: WICKET-5499 Page is not touched during initialization
Updated Branches:
refs/heads/master 141769363 -> d86d9afa8
WICKET-5499 Page is not touched during initialization
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/d86d9afa
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/d86d9afa
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/d86d9afa
Branch: refs/heads/master
Commit: d86d9afa8fc5d21d0d5a1c70e0fcd780ace6e3e6
Parents: 1417693
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Tue Feb 11 21:31:50 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Tue Feb 11 21:31:50 2014 +0200
----------------------------------------------------------------------
.../request/handler/RenderPageRequestHandler.java | 17 +++++++++++++++++
.../apache/wicket/protocol/http/WebSession.java | 3 +--
.../apache/wicket/request/cycle/RequestCycle.java | 8 --------
.../internal/EnclosurePageExpectedResult_10-2.html | 5 +----
.../internal/EnclosurePageExpectedResult_10-3.html | 2 +-
5 files changed, 20 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/d86d9afa/wicket-core/src/main/java/org/apache/wicket/core/request/handler/RenderPageRequestHandler.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/core/request/handler/RenderPageRequestHandler.java b/wicket-core/src/main/java/org/apache/wicket/core/request/handler/RenderPageRequestHandler.java
index 94dec22..3cceadd 100644
--- a/wicket-core/src/main/java/org/apache/wicket/core/request/handler/RenderPageRequestHandler.java
+++ b/wicket-core/src/main/java/org/apache/wicket/core/request/handler/RenderPageRequestHandler.java
@@ -17,6 +17,8 @@
package org.apache.wicket.core.request.handler;
import org.apache.wicket.Application;
+import org.apache.wicket.Page;
+import org.apache.wicket.Session;
import org.apache.wicket.core.request.handler.logger.PageLogData;
import org.apache.wicket.request.ILoggableRequestHandler;
import org.apache.wicket.request.IRequestCycle;
@@ -102,6 +104,21 @@ public class RenderPageRequestHandler
this.redirectPolicy = redirectPolicy;
this.pageProvider = pageProvider;
+
+ if (pageProvider.hasPageInstance())
+ {
+ IRequestablePage page = pageProvider.getPageInstance();
+ if (page instanceof Page)
+ {
+ ((Page) page).setStatelessHint(false);
+ }
+
+ if (Session.exists())
+ {
+ // WICKET-5499
+ Session.get().getPageManager().touchPage(page);
+ }
+ }
}
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/d86d9afa/wicket-core/src/main/java/org/apache/wicket/protocol/http/WebSession.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/protocol/http/WebSession.java b/wicket-core/src/main/java/org/apache/wicket/protocol/http/WebSession.java
index 1f50560..590c31e 100644
--- a/wicket-core/src/main/java/org/apache/wicket/protocol/http/WebSession.java
+++ b/wicket-core/src/main/java/org/apache/wicket/protocol/http/WebSession.java
@@ -101,7 +101,6 @@ public class WebSession extends Session
setMetaData(BROWSER_WAS_POLLED_KEY, Boolean.TRUE);
WebPage browserInfoPage = newBrowserInfoPage();
- getPageManager().touchPage(browserInfoPage);
throw new RestartResponseAtInterceptPageException(browserInfoPage);
}
// if we get here, the redirect already has been done; clear
@@ -125,4 +124,4 @@ public class WebSession extends Session
{
return new BrowserInfoPage();
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/wicket/blob/d86d9afa/wicket-core/src/main/java/org/apache/wicket/request/cycle/RequestCycle.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/request/cycle/RequestCycle.java b/wicket-core/src/main/java/org/apache/wicket/request/cycle/RequestCycle.java
index 97e0ebf..ba9de5c 100644
--- a/wicket-core/src/main/java/org/apache/wicket/request/cycle/RequestCycle.java
+++ b/wicket-core/src/main/java/org/apache/wicket/request/cycle/RequestCycle.java
@@ -659,14 +659,6 @@ public class RequestCycle implements IRequestCycle, IEventSink
*/
public void setResponsePage(IRequestablePage page)
{
- if (page instanceof Page)
- {
- ((Page) page).setStatelessHint(false);
- }
-
- // make sure the page will be available on following request
- Session.get().getPageManager().touchPage(page);
-
scheduleRequestHandlerAfterCurrent(new RenderPageRequestHandler(new PageProvider(page),
RenderPageRequestHandler.RedirectPolicy.AUTO_REDIRECT));
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/d86d9afa/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_10-2.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_10-2.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_10-2.html
index 382611c..2ad7536 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_10-2.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_10-2.html
@@ -1,8 +1,5 @@
<html xmlns:wicket>
<body>
- <wicket:enclosure child="input">
- <input wicket:id="input" type="checkbox" name="input"/>
- <span wicket:id="label"></span>
- </wicket:enclosure>
+
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/d86d9afa/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_10-3.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_10-3.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_10-3.html
index 382611c..6f82c85 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_10-3.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_10-3.html
@@ -2,7 +2,7 @@
<body>
<wicket:enclosure child="input">
<input wicket:id="input" type="checkbox" name="input"/>
- <span wicket:id="label"></span>
+
</wicket:enclosure>
</body>
</html>