From c43531935158f78caa3635aa4f9d9dc9a7067233 Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sun, 24 Oct 2010 13:28:15 +0000
Subject: [PATCH] Code clean-up

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1026795 13f79535-47bb-0310-9956-ffa450edef68
---
 .../catalina/ha/session/JvmRouteBinderValve.java   | 30 ++++++++++------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java b/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
index bf982e6a1..8cb592873 100644
--- a/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
+++ b/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
@@ -367,11 +367,8 @@ public class JvmRouteBinderValve extends ValveBase implements ClusterValve {
             ((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 ValveBase implements ClusterValve {
      * 
      * @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);
+        }
     }
 
     /**
-- 
2.11.0