diff --git a/src/java/org/apache/cassandra/db/RecoveryManager.java b/src/java/org/apache/cassandra/db/RecoveryManager.java index 02b53379cd..d09713af03 100644 --- a/src/java/org/apache/cassandra/db/RecoveryManager.java +++ b/src/java/org/apache/cassandra/db/RecoveryManager.java @@ -28,18 +28,8 @@ import org.apache.commons.lang.StringUtils; public class RecoveryManager { - private static RecoveryManager instance_; private static Logger logger_ = Logger.getLogger(RecoveryManager.class); - public synchronized static RecoveryManager instance() throws IOException - { - if (instance_ == null) - { - instance_ = new RecoveryManager(); - } - return instance_; - } - public static File[] getListofCommitLogs() { String directory = DatabaseDescriptor.getLogFileLocation(); diff --git a/src/java/org/apache/cassandra/service/CassandraDaemon.java b/src/java/org/apache/cassandra/service/CassandraDaemon.java index a66bf010b6..efbaa917d7 100644 --- a/src/java/org/apache/cassandra/service/CassandraDaemon.java +++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java @@ -91,7 +91,6 @@ public class CassandraDaemon } // replay the log if necessary - RecoveryManager recoveryMgr = RecoveryManager.instance(); RecoveryManager.doRecovery(); // now we start listening for clients diff --git a/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java b/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java index a39312f394..5ccfc59b71 100644 --- a/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java +++ b/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java @@ -35,8 +35,7 @@ public class RecoveryManagerTest extends CleanupHelper @Test public void testNothing() throws IOException { // TODO nothing to recover - RecoveryManager rm = RecoveryManager.instance(); - rm.doRecovery(); + RecoveryManager.doRecovery(); } @Test