svn commit: r784780 - /incubator/cassandra/trunk/src/java/org/apache/cassandra/db/DBManager.java

[jbellis]

Author: jbellis
Date: Mon Jun 15 13:42:30 2009
New Revision: 784780

URL: http://svn.apache.org/viewvc?rev=784780&view=rev
Log:
switch singleton implementation from double-checked-locking to synchronized 
(code is not performance-sensitive).  patch by Edward Ribeiro; reviewed by 
jbellis for CASSANDRA-228

Modified:
    incubator/cassandra/trunk/src/java/org/apache/cassandra/db/DBManager.java

Modified: 
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/DBManager.java
URL: 
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/DBManager.java?rev=784780&r1=784779&r2=784780&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/db/DBManager.java 
(original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/db/DBManager.java 
Mon Jun 15 13:42:30 2009
@@ -19,10 +19,7 @@
 package org.apache.cassandra.db;
 
 import java.io.IOException;
-import java.util.Map;
 import java.util.Set;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
 
 import org.apache.cassandra.config.DatabaseDescriptor;
 import org.apache.cassandra.dht.IPartitioner;
@@ -39,22 +36,12 @@
 public class DBManager
 {
     private static DBManager dbMgr_;
-    private static Lock lock_ = new ReentrantLock();
 
-    public static DBManager instance() throws IOException
+    public static synchronized DBManager instance() throws IOException
     {
-        if ( dbMgr_ == null )
+        if (dbMgr_ == null)
         {
-            lock_.lock();
-            try
-            {
-                if ( dbMgr_ == null )
-                    dbMgr_ = new DBManager();
-            }
-            finally
-            {
-                lock_.unlock();
-            }
+           dbMgr_ = new DBManager();
         }
         return dbMgr_;
     }