Author: fhanik
Date: Thu Apr 13 12:24:30 2006
New Revision: 393897
URL: http://svn.apache.org/viewcvs?rev=393897&view=rev
Log:
cross over ports from old cluster impl
Modified:
tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/DeltaManager.java
tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/JvmRouteBinderValve.java
Modified:
tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/DeltaManager.java
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/DeltaManager.java?rev=393897&r1=393896&r2=393897&view=diff
==============================================================================
---
tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/DeltaManager.java
(original)
+++
tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/DeltaManager.java
Thu Apr 13 12:24:30 2006
@@ -568,6 +568,7 @@
sessionId,
sessionId + "-" +
System.currentTimeMillis());
if (log.isDebugEnabled())
log.debug(sm.getString("deltaManager.sendMessage.newSession",name, sessionId));
+ msg.setTimestamp(session.getCreationTime());
counterSend_EVT_SESSION_CREATED++;
send(msg);
}
@@ -1410,6 +1411,7 @@
session.setManager(this);
session.setValid(true);
session.setPrimarySession(false);
+ session.setCreationTime(msg.getTimestamp());
session.access();
if(notifySessionListenersOnReplication)
session.setId(msg.getSessionID());
Modified:
tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/JvmRouteBinderValve.java
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/JvmRouteBinderValve.java?rev=393897&r1=393896&r2=393897&view=diff
==============================================================================
---
tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/JvmRouteBinderValve.java
(original)
+++
tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/JvmRouteBinderValve.java
Thu Apr 13 12:24:30 2006
@@ -225,12 +225,7 @@
log.warn(sm.getString("jvmRoute.missingJvmRouteAttribute"));
return;
}
- if (request.isRequestedSessionIdFromURL()) {
- if (log.isDebugEnabled())
- log.debug(sm.getString("jvmRoute.skipURLSessionIDs"));
- } else {
- handleJvmRoute( request, response,session.getIdInternal(),
jvmRoute);
- }
+ handleJvmRoute( request, response,session.getIdInternal(),
jvmRoute);
if (log.isDebugEnabled()) {
long t2 = System.currentTimeMillis();
long time = t2 - t1;
@@ -352,7 +347,7 @@
catalinaSession.setId(newSessionID);
if (catalinaSession instanceof DeltaSession)
((DeltaSession) catalinaSession).resetDeltaRequest();
- setNewSessionCookie(request, response,newSessionID);
+ if(request.isRequestedSessionIdFromCookie())
setNewSessionCookie(request, response,newSessionID);
// set orginal sessionid at request, to allow application detect the
// change
if (sessionIdAttribute != null && !"".equals(sessionIdAttribute)) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
