Return-Path: Delivered-To: apmail-incubator-cassandra-commits-archive@minotaur.apache.org Received: (qmail 46275 invoked from network); 20 Nov 2009 19:07:38 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 20 Nov 2009 19:07:38 -0000 Received: (qmail 38249 invoked by uid 500); 20 Nov 2009 19:07:38 -0000 Delivered-To: apmail-incubator-cassandra-commits-archive@incubator.apache.org Received: (qmail 38221 invoked by uid 500); 20 Nov 2009 19:07:38 -0000 Mailing-List: contact cassandra-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cassandra-dev@incubator.apache.org Delivered-To: mailing list cassandra-commits@incubator.apache.org Received: (qmail 38211 invoked by uid 99); 20 Nov 2009 19:07:38 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 20 Nov 2009 19:07:38 +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; Fri, 20 Nov 2009 19:07:36 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id B2CA823888C5; Fri, 20 Nov 2009 19:07:14 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r882682 - in /incubator/cassandra/trunk/src/java/org/apache/cassandra: gms/FailureDetector.java gms/Gossiper.java net/MessagingService.java Date: Fri, 20 Nov 2009 19:06:48 -0000 To: cassandra-commits@incubator.apache.org From: jbellis@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091120190714.B2CA823888C5@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jbellis Date: Fri Nov 20 19:06:22 2009 New Revision: 882682 URL: http://svn.apache.org/viewvc?rev=882682&view=rev Log: make members volatile where necessary to make double-checked locking safe. patch by gdusbabek; reviewed by jbellis for CASSANDRA-248 Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/gms/FailureDetector.java incubator/cassandra/trunk/src/java/org/apache/cassandra/gms/Gossiper.java incubator/cassandra/trunk/src/java/org/apache/cassandra/net/MessagingService.java Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/gms/FailureDetector.java URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/gms/FailureDetector.java?rev=882682&r1=882681&r2=882682&view=diff ============================================================================== --- incubator/cassandra/trunk/src/java/org/apache/cassandra/gms/FailureDetector.java (original) +++ incubator/cassandra/trunk/src/java/org/apache/cassandra/gms/FailureDetector.java Fri Nov 20 19:06:22 2009 @@ -49,7 +49,7 @@ private static final int phiConvictThreshold_ = 8; /* The Failure Detector has to have been up for at least 1 min. */ private static final long uptimeThreshold_ = 60000; - private static IFailureDetector failureDetector_; + private static volatile IFailureDetector failureDetector_; /* Used to lock the factory for creation of FailureDetector instance */ private static Lock createLock_ = new ReentrantLock(); /* The time when the module was instantiated. */ Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/gms/Gossiper.java URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/gms/Gossiper.java?rev=882682&r1=882681&r2=882682&view=diff ============================================================================== --- incubator/cassandra/trunk/src/java/org/apache/cassandra/gms/Gossiper.java (original) +++ incubator/cassandra/trunk/src/java/org/apache/cassandra/gms/Gossiper.java Fri Nov 20 19:06:22 2009 @@ -96,7 +96,7 @@ final static String GOSSIP_DIGEST_ACK2_VERB = "GA2V"; public final static int intervalInMillis_ = 1000; private static Logger logger_ = Logger.getLogger(Gossiper.class); - static Gossiper gossiper_; + private static volatile Gossiper gossiper_; public synchronized static Gossiper instance() { Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/net/MessagingService.java URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/net/MessagingService.java?rev=882682&r1=882681&r2=882682&view=diff ============================================================================== --- incubator/cassandra/trunk/src/java/org/apache/cassandra/net/MessagingService.java (original) +++ incubator/cassandra/trunk/src/java/org/apache/cassandra/net/MessagingService.java Fri Nov 20 19:06:22 2009 @@ -89,7 +89,7 @@ private static Logger logger_ = Logger.getLogger(MessagingService.class); - private static MessagingService messagingService_ = new MessagingService(); + private static volatile MessagingService messagingService_ = new MessagingService(); private static final int MESSAGE_DESERIALIZE_THREADS = 4;