svn commit: r535631 - /incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/SecondLevelCacheSessionStore.java

[knopp]

Author: knopp
Date: Sun May  6 09:04:43 2007
New Revision: 535631

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

Modified:
    
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/SecondLevelCacheSessionStore.java

Modified: 
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/SecondLevelCacheSessionStore.java
URL: 
http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/SecondLevelCacheSessionStore.java?view=diff&rev=535631&r1=535630&r2=535631
==============================================================================
--- 
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/SecondLevelCacheSessionStore.java
 (original)
+++ 
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/SecondLevelCacheSessionStore.java
 Sun May  6 09:04:43 2007
@@ -147,7 +147,7 @@
                                int ajaxVersionNumber = 0;
                                if (pv == null)
                                {
-                                       int index = pageVersions.indexOf(new 
PageVersions(id,-1,-1));
+                                       int index = pageVersions.indexOf(new 
PageVersions(id, versionNumber,-1));
                                        if (index != -1)
                                        {
                                                pv = 
(PageVersions)pageVersions.get(index);
@@ -208,7 +208,7 @@
                        {
                                this.pageid = pageid;
                                this.versionid = versionid;
-                               this.ajaxversionid = versionid;
+                               this.ajaxversionid = ajaxversionid;
                        }
                        
                        /**
@@ -218,7 +218,8 @@
                        {
                                if (obj instanceof PageVersions)
                                {
-                                       return ((PageVersions)obj).pageid == 
pageid; 
+                                       return ((PageVersions)obj).pageid == 
pageid &&
+                                              ((PageVersions)obj).versionid == 
versionid;
                                }
                                return false;
                        }