Author: markt
Date: Wed Apr 28 23:07:43 2010
New Revision: 939130
URL: http://svn.apache.org/viewvc?rev=939130&view=rev
Log:
Follow up on pero's review comments.
Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
Modified: tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java?rev=939130&r1=939129&r2=939130&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java Wed Apr
28 23:07:43 2010
@@ -94,7 +94,7 @@ public class DeltaManager extends Cluste
/**
* 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 Cluste
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] ;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
