From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 28 Apr 2010 23:07:43 +0000 (+0000)
Subject: Follow up on pero's review comments.
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=531ccdf9376ade3242eb9dfa2e970ea8cfc2efef;p=tomcat7.0

Follow up on pero's review comments.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@939130 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/java/org/apache/catalina/ha/session/DeltaManager.java b/java/org/apache/catalina/ha/session/DeltaManager.java
index c440fd2ac..d88ebd065 100644
--- a/java/org/apache/catalina/ha/session/DeltaManager.java
+++ b/java/org/apache/catalina/ha/session/DeltaManager.java
@@ -94,7 +94,7 @@ public class DeltaManager extends ClusterManagerBase{
     /**
      * cached replication valve cluster container!
      */
-    private ReplicationValve replicationValve = null ;
+    private volatile ReplicationValve replicationValve = null ;
     
     /**
      * The maximum number of active Sessions allowed, or -1 for no limit.
@@ -882,9 +882,9 @@ public class DeltaManager extends ClusterManagerBase{
     protected void registerSessionAtReplicationValve(DeltaSession session) {
         if(replicationValve == null) {
             if(container instanceof StandardContext && ((StandardContext)container).getCrossContext()) {
-                Cluster cluster = getCluster() ;
+                CatalinaCluster cluster = getCluster() ;
                 if(cluster != null) {
-                    Valve[] valves = ((CatalinaCluster)cluster).getValves();
+                    Valve[] valves = cluster.getValves();
                     if(valves != null && valves.length > 0) {
                         for(int i=0; replicationValve == null && i < valves.length ; i++ ){
                             if(valves[i] instanceof ReplicationValve) replicationValve = (ReplicationValve)valves[i] ;