svn commit: r889705 - in /incubator/cassandra/trunk: src/java/org/apache/cassandra/db/RecoveryManager.java src/java/org/apache/cassandra/service/CassandraDaemon.java test/unit/org/apache/cassandra/db/RecoveryManagerTest.java

[jbellis]

Author: jbellis
Date: Fri Dec 11 17:11:40 2009
New Revision: 889705

URL: http://svn.apache.org/viewvc?rev=889705&view=rev
Log:
r/m unused RecoveryManager instance (class is entirely static).  patch by 
jbellis

Modified:
    
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/RecoveryManager.java
    
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/CassandraDaemon.java
    
incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java

Modified: 
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/RecoveryManager.java
URL: 
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/RecoveryManager.java?rev=889705&r1=889704&r2=889705&view=diff
==============================================================================
--- 
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/RecoveryManager.java 
(original)
+++ 
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/RecoveryManager.java 
Fri Dec 11 17:11:40 2009
@@ -28,18 +28,8 @@
 
 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();

Modified: 
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/CassandraDaemon.java
URL: 
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/service/CassandraDaemon.java?rev=889705&r1=889704&r2=889705&view=diff
==============================================================================
--- 
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/CassandraDaemon.java
 (original)
+++ 
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/CassandraDaemon.java
 Fri Dec 11 17:11:40 2009
@@ -91,7 +91,6 @@
         }
 
         // replay the log if necessary
-        RecoveryManager recoveryMgr = RecoveryManager.instance();
         RecoveryManager.doRecovery();
 
         // now we start listening for clients

Modified: 
incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java
URL: 
http://svn.apache.org/viewvc/incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java?rev=889705&r1=889704&r2=889705&view=diff
==============================================================================
--- 
incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java
 (original)
+++ 
incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java
 Fri Dec 11 17:11:40 2009
@@ -35,8 +35,7 @@
     @Test
     public void testNothing() throws IOException {
         // TODO nothing to recover
-        RecoveryManager rm = RecoveryManager.instance();
-        rm.doRecovery();  
+        RecoveryManager.doRecovery();
     }
 
     @Test