svn commit: r1065668 - /cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/AbstractCassandraDaemon.java

[jb...@apache.org]

Author: jbellis
Date: Mon Jan 31 16:16:06 2011
New Revision: 1065668

URL: http://svn.apache.org/viewvc?rev=1065668&view=rev
Log:
fix circular initialization problem with PropertyFileSnitch caused by #1951
patch by slebresne; reviewed by jbellis

Modified:
    cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/AbstractCassandraDaemon.java

Modified: cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/AbstractCassandraDaemon.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/AbstractCassandraDaemon.java?rev=1065668&r1=1065667&r2=1065668&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/AbstractCassandraDaemon.java (original)
+++ cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/AbstractCassandraDaemon.java Mon Jan 31 16:16:06 2011
@@ -56,11 +56,6 @@ import org.mortbay.thread.ThreadPool;
  */
 public abstract class AbstractCassandraDaemon implements CassandraDaemon
 {
-    public AbstractCassandraDaemon()
-    {
-        StorageService.instance.registerDaemon(this);
-    }
-
     //Initialize logging in such a way that it checks for config changes every 10 seconds.
     static
     {
@@ -184,6 +179,7 @@ public abstract class AbstractCassandraD
         SystemTable.purgeIncompatibleHints();
 
         // start server internals
+        StorageService.instance.registerDaemon(this);
         try
         {
             StorageService.instance.initServer();