fhanik 2005/03/03 06:06:37
Modified: modules/cluster/src/share/org/apache/catalina/cluster/session
DeltaManager.java DeltaSession.java
Log:
Make sure the delta request is initated properly, fix thanks to Tkayuki
Kaneko, JP
Revision Changes Path
1.41 +2 -1
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java
Index: DeltaManager.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- DeltaManager.java 15 Feb 2005 09:25:04 -0000 1.40
+++ DeltaManager.java 3 Mar 2005 14:06:36 -0000 1.41
@@ -409,6 +409,7 @@
//make sure that the session gets ready to expire if
// needed
session.setAccessCount(0);
+ session.resetDeltaRequest();
sessions.put(session.getId(), session);
}
} catch (ClassNotFoundException e) {
1.30 +4 -2
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaSession.java
Index: DeltaSession.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaSession.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- DeltaSession.java 11 Feb 2005 19:43:51 -0000 1.29
+++ DeltaSession.java 3 Mar 2005 14:06:36 -0000 1.30
@@ -97,7 +97,7 @@
super();
this.manager = manager;
-
+ this.resetDeltaRequest();
}
// ----------------------------------------------------- Instance
Variables
@@ -350,6 +350,8 @@
if (manager != null)
manager.add(this);
tellNew();
+ if ( deltaRequest == null ) resetDeltaRequest();
+ else deltaRequest.setSessionId(id);
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
