Return-Path: Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: (qmail 51985 invoked from network); 31 Jan 2011 16:16:33 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 31 Jan 2011 16:16:33 -0000 Received: (qmail 96020 invoked by uid 500); 31 Jan 2011 16:16:33 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 95935 invoked by uid 500); 31 Jan 2011 16:16:31 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 95927 invoked by uid 99); 31 Jan 2011 16:16:30 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 31 Jan 2011 16:16:30 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 31 Jan 2011 16:16:28 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 1B9462388A6E; Mon, 31 Jan 2011 16:16:07 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1065668 - /cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/AbstractCassandraDaemon.java Date: Mon, 31 Jan 2011 16:16:07 -0000 To: commits@cassandra.apache.org From: jbellis@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110131161607.1B9462388A6E@eris.apache.org> X-Virus-Checked: Checked by ClamAV on 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();