Author: jbellis
Date: Mon Dec 14 20:01:49 2009
New Revision: 890461
URL: http://svn.apache.org/viewvc?rev=890461&view=rev
Log:
add missing volatile, final modifiers. patch by jbellis; reviewed by Stu Hood
for CASSANDRA-614
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/HintedHandOffManager.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/ReadRepairManager.java
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/HintedHandOffManager.java
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/HintedHandOffManager.java?rev=890461&r1=890460&r2=890461&view=diff
==============================================================================
---
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/HintedHandOffManager.java
(original)
+++
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/HintedHandOffManager.java
Mon Dec 14 20:01:49 2009
@@ -74,23 +74,23 @@
public class HintedHandOffManager
{
- private static HintedHandOffManager instance_;
- private static Lock lock_ = new ReentrantLock();
- private static Logger logger_ =
Logger.getLogger(HintedHandOffManager.class);
+ private static volatile HintedHandOffManager instance_;
+ private static final Lock lock_ = new ReentrantLock();
+ private static final Logger logger_ =
Logger.getLogger(HintedHandOffManager.class);
final static long INTERVAL_IN_MS = 3600 * 1000;
- private ExecutorService executor_ = new
DebuggableThreadPoolExecutor("HINTED-HANDOFF-POOL");
- Timer timer = new Timer("HINTED-HANDOFF-TIMER");
+ private final ExecutorService executor_ = new
DebuggableThreadPoolExecutor("HINTED-HANDOFF-POOL");
+ final Timer timer = new Timer("HINTED-HANDOFF-TIMER");
public static final String HINTS_CF = "HintsColumnFamily";
public static HintedHandOffManager instance()
{
- if ( instance_ == null )
+ if (instance_ == null)
{
lock_.lock();
try
{
- if ( instance_ == null )
+ if (instance_ == null)
instance_ = new HintedHandOffManager();
}
finally
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/ReadRepairManager.java
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/service/ReadRepairManager.java?rev=890461&r1=890460&r2=890461&view=diff
==============================================================================
---
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/ReadRepairManager.java
(original)
+++
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/ReadRepairManager.java
Mon Dec 14 20:01:49 2009
@@ -47,10 +47,10 @@
*/
class ReadRepairManager
{
- private static Logger logger_ = Logger.getLogger(ReadRepairManager.class);
+ private static final Logger logger_ =
Logger.getLogger(ReadRepairManager.class);
private static final long expirationTimeInMillis = 2000;
- private static Lock lock_ = new ReentrantLock();
- private static ReadRepairManager self_ = null;
+ private static final Lock lock_ = new ReentrantLock();
+ private static volatile ReadRepairManager self_ = null;
/*
* This is the internal class which actually
@@ -94,7 +94,7 @@
lock_.lock();
try
{
- if ( self_ == null )
+ if (self_ == null)
self_ = new ReadRepairManager();
}
finally
