You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by xu...@apache.org on 2010/09/20 17:09:38 UTC
svn commit: r998953 -
/geronimo/server/trunk/plugins/jetty8/geronimo-jetty8-clustering-wadi/src/main/java/org/apache/geronimo/jetty8/cluster/ClusteredSessionManager.java
Author: xuhaihong
Date: Mon Sep 20 15:09:38 2010
New Revision: 998953
URL: http://svn.apache.org/viewvc?rev=998953&view=rev
Log:
Update integration codes according to the last codes of Jetty8
Modified:
geronimo/server/trunk/plugins/jetty8/geronimo-jetty8-clustering-wadi/src/main/java/org/apache/geronimo/jetty8/cluster/ClusteredSessionManager.java
Modified: geronimo/server/trunk/plugins/jetty8/geronimo-jetty8-clustering-wadi/src/main/java/org/apache/geronimo/jetty8/cluster/ClusteredSessionManager.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty8/geronimo-jetty8-clustering-wadi/src/main/java/org/apache/geronimo/jetty8/cluster/ClusteredSessionManager.java?rev=998953&r1=998952&r2=998953&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty8/geronimo-jetty8-clustering-wadi/src/main/java/org/apache/geronimo/jetty8/cluster/ClusteredSessionManager.java (original)
+++ geronimo/server/trunk/plugins/jetty8/geronimo-jetty8-clustering-wadi/src/main/java/org/apache/geronimo/jetty8/cluster/ClusteredSessionManager.java Mon Sep 20 15:09:38 2010
@@ -97,7 +97,7 @@ public class ClusteredSessionManager ext
@Override
protected void invalidateSessions() {
// We do not need to clear idToSession: when the SessionManager GBean is stopped, all the sessions
- // it defines are migrated to other SessionManagers. These outbound session migrations will remove
+ // it defines are migrated to other SessionManagers. These outbound session migrations will remove
// them from idToSession.
}
@@ -116,7 +116,7 @@ public class ClusteredSessionManager ext
ClusteredSession clusteredSession = getClusteredSession(session);
removeSession(clusteredSession, true);
}
-
+
private ClusteredSession getClusteredSession(org.apache.geronimo.clustering.Session session) throws AssertionError {
ClusteredSession clusteredSession;
synchronized (idToSession) {
@@ -127,8 +127,8 @@ public class ClusteredSessionManager ext
}
return clusteredSession;
}
-
-
+
+
}
public class ClusteredSession extends Session {
@@ -145,7 +145,7 @@ public class ClusteredSessionManager ext
}
protected ClusteredSession(org.apache.geronimo.clustering.Session session) {
- super(System.currentTimeMillis(), session.getSessionId());
+ super(System.currentTimeMillis(), System.currentTimeMillis(), session.getSessionId());
this.session = session;
initValues();
}