Return-Path: 
 <dev-return-108705-apmail-tomcat-dev-archive=tomcat.apache.org@tomcat.apache.org>
Delivered-To: apmail-tomcat-dev-archive@www.apache.org
Received: (qmail 79359 invoked from network); 24 Aug 2010 12:22:44 -0000
Received: from unknown (HELO mail.apache.org) (140.211.11.3)
  by 140.211.11.9 with SMTP; 24 Aug 2010 12:22:44 -0000
Received: (qmail 55530 invoked by uid 500); 24 Aug 2010 12:22:43 -0000
Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org
Received: (qmail 54801 invoked by uid 500); 24 Aug 2010 12:22:39 -0000
Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:dev-help@tomcat.apache.org>
List-Unsubscribe: <mailto:dev-unsubscribe@tomcat.apache.org>
List-Post: <mailto:dev@tomcat.apache.org>
List-Id: <dev.tomcat.apache.org>
Reply-To: "Tomcat Developers List" <dev@tomcat.apache.org>
Delivered-To: mailing list dev@tomcat.apache.org
Received: (qmail 54785 invoked by uid 99); 24 Aug 2010 12:22:37 -0000
Received: from Unknown (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 24 Aug 2010 12:22:37 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 24 Aug 2010 12:22:20 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 7024323888E8; Tue, 24 Aug 2010 12:21:01 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r988503 - in /tomcat/sandbox/tomcat-oacc/trunk:
 docs/changelog.xml
 src/share/org/apache/catalina/cluster/session/DeltaManager.java
Date: Tue, 24 Aug 2010 12:21:01 -0000
To: dev@tomcat.apache.org
From: rjung@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20100824122101.7024323888E8@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: rjung
Date: Tue Aug 24 12:21:01 2010
New Revision: 988503

URL: http://svn.apache.org/viewvc?rev=988503&view=rev
Log:
Remove unneeded cast and make ReplicationValve volatile
in the DeltaManager.

Backport of r937325 and r939130 from trunk.

Modified:
    tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml
    tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaManager.java

Modified: tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml?rev=988503&r1=988502&r2=988503&view=diff
==============================================================================
--- tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml (original)
+++ tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml Tue Aug 24 12:21:01 2010
@@ -32,6 +32,10 @@
 <section name="Tomcat OACC 0.1 (rjung)">
   <subsection name="Cluster">
       <fix>
+        Remove unneeded cast and make ReplicationValve volatile
+        in the DeltaManager. (rjung)
+      </fix>
+      <fix>
         Remove empty implementations of methods no longer existing
         in the Cluster interface. (rjung)
       </fix>

Modified: tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaManager.java
URL: http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaManager.java?rev=988503&r1=988502&r2=988503&view=diff
==============================================================================
--- tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaManager.java (original)
+++ tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaManager.java Tue Aug 24 12:21:01 2010
@@ -101,7 +101,7 @@ public class DeltaManager extends Cluste
     /**
      * cached replication valve cluster container!
      */
-    private ReplicationValve replicationValve = null ;
+    private volatile ReplicationValve replicationValve = null ;
     
     /**
      * The lifecycle event support for this component.
@@ -1074,9 +1074,9 @@ public class DeltaManager extends Cluste
     protected void registerSessionAtReplicationValve(DeltaSession session) {
         if(replicationValve == null) {
             if(container instanceof StandardContext && ((StandardContext)container).getCrossContext()) {
-                Cluster cluster = getCluster() ;
-                if(cluster != null && cluster instanceof CatalinaCluster) {
-                    Valve[] valves = ((CatalinaCluster)cluster).getValves();
+                CatalinaCluster cluster = getCluster() ;
+                if(cluster != null) {
+                    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: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org