svn commit: r771780 - /wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/pagestore/DiskPageStore.java

[knopp]

Author: knopp
Date: Tue May  5 15:13:43 2009
New Revision: 771780

URL: http://svn.apache.org/viewvc?rev=771780&view=rev
Log:

Issue: WICKET-2099

Modified:
    
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/pagestore/DiskPageStore.java

Modified: 
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/pagestore/DiskPageStore.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/pagestore/DiskPageStore.java?rev=771780&r1=771779&r2=771780&view=diff
==============================================================================
--- 
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/pagestore/DiskPageStore.java
 (original)
+++ 
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/pagestore/DiskPageStore.java
 Tue May  5 15:13:43 2009
@@ -1168,7 +1168,8 @@
                else if (page instanceof SerializedPageWithSession)
                {
                        SerializedPageWithSession serialized = 
(SerializedPageWithSession)page;
-                       if (serialized.page.get() == 
SerializedPageWithSession.NO_PAGE)
+                       if (serialized.page != null &&
+                               serialized.page.get() == 
SerializedPageWithSession.NO_PAGE)
                        {
                                // stripped page, need to restore it first
                                result = 
restoreStrippedSerializedPage(serialized);