Author: knopp
Date: Mon Apr 6 02:02:03 2009
New Revision: 762197
URL: http://svn.apache.org/viewvc?rev=762197&view=rev
Log: (empty)
Modified:
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/page/persistent/PersistentPageManager.java
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/handler/PageProvider.java
Modified:
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/page/persistent/PersistentPageManager.java
URL:
http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/page/persistent/PersistentPageManager.java?rev=762197&r1=762196&r2=762197&view=diff
==============================================================================
---
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/page/persistent/PersistentPageManager.java
(original)
+++
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/page/persistent/PersistentPageManager.java
Mon Apr 6 02:02:03 2009
@@ -144,8 +144,8 @@
@Override
protected IPage getPage(int id)
{
- SessionEntry entry = getSessionEntry(false);
- IPage page = entry.getPage(id);
+ SessionEntry entry = getSessionEntry(false);
+ IPage page = entry != null ? entry.getPage(id) : null;
if (page != null)
{
return page;
Modified:
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/handler/PageProvider.java
URL:
http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/handler/PageProvider.java?rev=762197&r1=762196&r2=762197&view=diff
==============================================================================
---
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/handler/PageProvider.java
(original)
+++
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/handler/PageProvider.java
Mon Apr 6 02:02:03 2009
@@ -200,6 +200,8 @@
{
IPage page = null;
+ boolean freshCreated = false;
+
if (pageId != null)
{
page = pageSource.getPageInstance(pageId);
@@ -217,6 +219,7 @@
if (pageClass != null)
{
page = pageSource.newPageInstance(pageClass,
pageParameters);
+ freshCreated = true;
if (prepareForRenderNewPage() && page
instanceof Page)
{
((Page) page).prepareForRender(false);
@@ -224,7 +227,7 @@
}
}
- if (page != null)
+ if (page != null && !freshCreated)
{
if (renderCount != null && page.getRenderCount() !=
renderCount)
{
