Author: markt
Date: Sun Oct 24 13:28:15 2010
New Revision: 1026795
URL: http://svn.apache.org/viewvc?rev=1026795&view=rev
Log:
Code clean-up
Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java?rev=1026795&r1=1026794&r2=1026795&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
Sun Oct 24 13:28:15 2010
@@ -367,11 +367,8 @@ public class JvmRouteBinderValve extends
((DeltaSession) catalinaSession).resetDeltaRequest();
changeRequestSessionID(request, sessionId, newSessionID);
- if (getCluster() != null) {
- // now sending the change to all other clusternodes!
- ClusterManager manager =
(ClusterManager)catalinaSession.getManager();
- sendSessionIDClusterBackup(manager,request,sessionId,
newSessionID);
- }
+ // now sending the change to all other clusternodes!
+ sendSessionIDClusterBackup(request,sessionId, newSessionID);
fireLifecycleEvent("After session migration", catalinaSession);
if (log.isDebugEnabled()) {
@@ -406,22 +403,23 @@ public class JvmRouteBinderValve extends
*
* @see JvmRouteSessionIDBinderListener#messageReceived(
* org.apache.catalina.ha.ClusterMessage)
- * @param manager
- * ClusterManager
* @param sessionId
* current failed sessionid
* @param newSessionID
* new session id, bind to the new cluster node
*/
- protected void sendSessionIDClusterBackup(ClusterManager manager,
- Request request, String sessionId, String newSessionID) {
- SessionIDMessage msg = new SessionIDMessage();
- msg.setOrignalSessionID(sessionId);
- msg.setBackupSessionID(newSessionID);
- Context context = request.getContext();
- msg.setContextPath(context.getPath());
- msg.setHost(context.getParent().getName());
- cluster.send(msg);
+ protected void sendSessionIDClusterBackup(Request request, String
sessionId,
+ String newSessionID) {
+ CatalinaCluster c = getCluster();
+ if (c != null) {
+ SessionIDMessage msg = new SessionIDMessage();
+ msg.setOrignalSessionID(sessionId);
+ msg.setBackupSessionID(newSessionID);
+ Context context = request.getContext();
+ msg.setContextPath(context.getPath());
+ msg.setHost(context.getParent().getName());
+ c.send(msg);
+ }
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
