svn commit: r783553 - /wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/SecondLevelCacheSessionStore.java

[knopp]

Author: knopp
Date: Wed Jun 10 22:16:07 2009
New Revision: 783553

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

Issue: WICKET-2268

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

Modified: 
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/SecondLevelCacheSessionStore.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/SecondLevelCacheSessionStore.java?rev=783553&r1=783552&r2=783553&view=diff
==============================================================================
--- 
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/SecondLevelCacheSessionStore.java
 (original)
+++ 
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/SecondLevelCacheSessionStore.java
 Wed Jun 10 22:16:07 2009
@@ -263,10 +263,14 @@
                        {
                                return true;
                        }
-                       else
+                       else if (getSession().getId() != null)
                        {
                                return 
getStore().containsPage(getSession().getId(), getName(), id, versionNumber);
                        }
+                       else
+                       {
+                               return false;
+                       }
                }
 
                /**
@@ -287,20 +291,21 @@
                        }
 
                        String sessionId = getSession().getId();
-                       if (getLastPage() != null && 
getLastPage().getNumericId() == id)
-                       {
-                               page = versionNumber != -1 ? 
getLastPage().getVersion(versionNumber)
-                                       : getLastPage();
-                               if (page != null)
-                               {
-                                       // ask the page store if it is ready 
saving the page.
-                                       getStore().pageAccessed(sessionId, 
page);
-                                       pages.put(id, page);
-                                       return page;
-                               }
-                       }
                        if (sessionId != null)
                        {
+                               if (getLastPage() != null && 
getLastPage().getNumericId() == id)
+                               {
+                                       page = versionNumber != -1 ? 
getLastPage().getVersion(versionNumber)
+                                               : getLastPage();
+                                       if (page != null)
+                                       {
+                                               // ask the page store if it is 
ready saving the page.
+                                               
getStore().pageAccessed(sessionId, page);
+                                               pages.put(id, page);
+                                               return page;
+                                       }
+                               }
+
                                setLastPage(null);
                                page = getStore().getPage(sessionId, getName(), 
id, versionNumber, -1);
                                pages.put(id, page);