Merge pull request #121 from cnauroth/cassandraDaemon

Add stopServer method to CassandraUtils.java
tjake · Aug 17, 2011 · 60ce47c · 60ce47c
2 parents 3e70885 + dfb7507
commit 60ce47c
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/src/lucandra/CassandraUtils.java b/src/lucandra/CassandraUtils.java
@@ -188,6 +188,8 @@ public class CassandraUtils
 
     private static boolean               cassandraStarted       = false;
 
+    private static CassandraDaemon       daemon                 = null;
+
     public static String                 fakeToken              = String.valueOf(System.nanoTime());
 
     public static synchronized void setStartup()
@@ -250,7 +252,7 @@ public static synchronized void startupServer() throws IOException
 
         System.setProperty("cassandra-foreground", "1");
 
-        final CassandraDaemon daemon = new CassandraDaemon();
+        daemon = new CassandraDaemon();
 
         try
         {
@@ -284,6 +286,16 @@ public void run()
         }
     }
 
+    public static synchronized void stopServer()
+    {
+        if (!cassandraStarted)
+            return;
+
+        daemon.deactivate();
+        daemon = null;
+        cassandraStarted = false;
+    }
+
     public static void createCassandraSchema() throws IOException
     {
         if (!cassandraStarted)