svn commit: r792974 - /wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/SecondLevelCacheSessionStore.java

[kn...@apache.org]

Author: knopp
Date: Fri Jul 10 15:13:37 2009
New Revision: 792974

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

Issue: WICKET-2268

Modified:
    wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/SecondLevelCacheSessionStore.java

Modified: wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/SecondLevelCacheSessionStore.java
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/SecondLevelCacheSessionStore.java?rev=792974&r1=792973&r2=792974&view=diff
==============================================================================
--- wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/SecondLevelCacheSessionStore.java (original)
+++ wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/SecondLevelCacheSessionStore.java Fri Jul 10 15:13:37 2009
@@ -67,8 +67,8 @@
 		 * <p>
 		 * Note that the versionNumber and ajaxVersionNumber parameters may be -1.
 		 * <ul>
-		 * <li>If ajaxVersionNumber is -1 and versionNumber is specified, the page store must
-		 * return the page with highest ajax version.
+		 * <li>If ajaxVersionNumber is -1 and versionNumber is specified, the page store must return
+		 * the page with highest ajax version.
 		 * <li>If both versionNumber and ajaxVersioNumber are -1, the pagestore must return last
 		 * touched (saved) page version with given id.
 		 * </ul>
@@ -258,10 +258,14 @@
 			{
 				return true;
 			}
-			else
+			else if (getSession().getId() != null)
 			{
 				return getStore().containsPage(getSession().getId(), getName(), id, versionNumber);
 			}
+			else
+			{
+				return false;
+			}
 		}
 
 		/**
@@ -293,20 +297,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);