Author: mgrigorov
Date: Sun Mar 13 18:24:48 2011
New Revision: 1081184

URL: http://svn.apache.org/viewvc?rev=1081184&view=rev
Log:
Use DefaultPageStore#storePage(SerializedPage) instead of adding the page 
directly in the cache.
#storePage() is smarter than that and removes any duplicates before adding a 
page.


Modified:
    
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/pageStore/DefaultPageStore.java

Modified: 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/pageStore/DefaultPageStore.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/pageStore/DefaultPageStore.java?rev=1081184&r1=1081183&r2=1081184&view=diff
==============================================================================
--- 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/pageStore/DefaultPageStore.java
 (original)
+++ 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/pageStore/DefaultPageStore.java
 Sun Mar 13 18:24:48 2011
@@ -478,7 +478,7 @@ public class DefaultPageStore implements
                                        if (result != null)
                                        {
                                                // move to top
-                                               cache.add(new 
SoftReference<SerializedPage>(result));
+                                               storePage(result);
                                        }
                                }
                        }
@@ -488,7 +488,6 @@ public class DefaultPageStore implements
                /**
                 * Store the serialized page in cache
                 * 
-                * @return serialized page
                 * @param sessionId
                 * @param page
                 * @param pagesList
@@ -508,6 +507,7 @@ public class DefaultPageStore implements
                                                if (entry != null && 
entry.equals(page))
                                                {
                                                        i.remove();
+                                                       break;
                                                }
                                        }
 


Reply via email to