fhanik 2004/02/04 12:22:26
Modified: modules/cluster/src/share/org/apache/catalina/cluster/session
DeltaManager.java DeltaSession.java
ReplicatedSession.java
Log:
Added in distributed expire logic for the delta session
Revision Changes Path
1.9 +18 -4
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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- DeltaManager.java 15 Jan 2004 05:29:05 -0000 1.8
+++ DeltaManager.java 4 Feb 2004 20:22:26 -0000 1.9
@@ -815,6 +815,20 @@
sessionId);
}
session.setPrimarySession(true);
+ //check to see if we need to send out an access message
+ if ( (msg == null) ) {
+ long replDelta = System.currentTimeMillis() -
session.getLastTimeReplicated();
+ if ( replDelta > (getMaxInactiveInterval()*1000) ) {
+ msg = new SessionMessage(getName(),
+ SessionMessage.EVT_SESSION_ACCESSED,
+ null,
+ sessionId);
+ }
+
+ }
+
+ //update last replicated time
+ if ( msg != null )
session.setLastTimeReplicated(System.currentTimeMillis());
return msg;
}
catch (IOException x) {
1.11 +20 -5
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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- DeltaSession.java 21 Jan 2004 19:00:19 -0000 1.10
+++ DeltaSession.java 4 Feb 2004 20:22:26 -0000 1.11
@@ -1,3 +1,4 @@
+
/*
* $Header$
* $Revision$
@@ -331,6 +332,13 @@
*/
private transient DeltaRequest deltaRequest = null;
+
+ /**
+ * Last time the session was replicatd, used for distributed
+ * expiring of session
+ */
+ private transient long lastTimeReplicated = System.currentTimeMillis();
+
// ----------------------------------------------------- Session Properties
/**
@@ -1469,7 +1477,6 @@
}
}
isValid = isValidSave;
-
}
@@ -1647,6 +1654,14 @@
return (attributes.get(name));
}
+ }
+
+ protected long getLastTimeReplicated() {
+ return lastTimeReplicated;
+ }
+
+ protected void setLastTimeReplicated(long lastTimeReplicated) {
+ this.lastTimeReplicated = lastTimeReplicated;
}
}
1.10 +4 -3
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/ReplicatedSession.java
Index: ReplicatedSession.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/ReplicatedSession.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ReplicatedSession.java 12 Jan 2004 05:23:10 -0000 1.9
+++ ReplicatedSession.java 4 Feb 2004 20:22:26 -0000 1.10
@@ -1,3 +1,4 @@
+
/*
* $Header$
* $Revision$
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
