You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by kn...@apache.org on 2008/11/19 22:18:17 UTC
svn commit: r719075 -
/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/SecondLevelCacheSessionStore.java
Author: knopp
Date: Wed Nov 19 13:18:16 2008
New Revision: 719075
URL: http://svn.apache.org/viewvc?rev=719075&view=rev
Log:
add serialization checks
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=719075&r1=719074&r2=719075&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 Nov 19 13:18:16 2008
@@ -376,8 +376,17 @@
Object page = lastPage;
if (store instanceof ISerializationAwarePageStore)
{
- page = ((ISerializationAwarePageStore)store).prepareForSerialization(sessionId,
- page);
+ if (page != null)
+ {
+ page = ((ISerializationAwarePageStore)store).prepareForSerialization(sessionId,
+ page);
+
+ if (page == null)
+ {
+ log.warn("PageStore prepared non-null page as null for serialization");
+ }
+
+ }
}
try
@@ -401,7 +410,11 @@
if (sessionId != null && store instanceof IClusteredPageStore == false)
{
Object lastPage = s.readObject();
- if (store instanceof ISerializationAwarePageStore)
+ if (lastPage == null)
+ {
+ log.warn("PageMap deserialization - got nulll lastPage");
+ }
+ else if (store instanceof ISerializationAwarePageStore)
{
lastPage = ((ISerializationAwarePageStore)store).restoreAfterSerialization((Serializable)lastPage);
}