svn commit: r1036874 - in /cassandra/branches/cassandra-0.7: CHANGES.txt src/java/org/apache/cassandra/service/StorageService.java

[jbellis]

Author: jbellis
Date: Fri Nov 19 14:34:14 2010
New Revision: 1036874

URL: http://svn.apache.org/viewvc?rev=1036874&view=rev
Log:
fix for bootstrap when no non-system tables are defined
patch by tjake; reviewed by jbellis for CASSANDRA-1732

Modified:
    cassandra/branches/cassandra-0.7/CHANGES.txt
    
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/StorageService.java

Modified: cassandra/branches/cassandra-0.7/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/CHANGES.txt?rev=1036874&r1=1036873&r2=1036874&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.7/CHANGES.txt Fri Nov 19 14:34:14 2010
@@ -39,6 +39,7 @@ dev
  * truncate includes secondary indexes (CASSANDRA-1747)
  * retain reference to PendingFile sstables (CASSANDRA-1749)
  * fix sstableimport regression (CASSANDRA-1753)
+ * fix for bootstrap when no non-system tables are defined (CASSANDRA-1732)
 
 
 0.7.0-beta3

Modified: 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/StorageService.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/StorageService.java?rev=1036874&r1=1036873&r2=1036874&view=diff
==============================================================================
--- 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/StorageService.java
 (original)
+++ 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/StorageService.java
 Fri Nov 19 14:34:14 2010
@@ -417,7 +417,7 @@ public class StorageService implements I
             {
                 isBootstrapMode = false;
                 SystemTable.setBootstrapped(true);
-                tokenMetadata_.updateNormalToken(token, 
FBUtilities.getLocalAddress());
+                setToken(token);
                 
Gossiper.instance.addLocalApplicationState(ApplicationState.STATUS, 
valueFactory.normal(token));
                 setMode("Normal", false);
             }