Author: brandonwilliams Date: Fri Dec 9 21:00:58 2011 New Revision: 1212627
URL: http://svn.apache.org/viewvc?rev=1212627&view=rev Log: Fix broken 3485 commit Modified: cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/SystemTable.java cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/gms/Gossiper.java cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/service/StorageService.java Modified: cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/SystemTable.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/SystemTable.java?rev=1212627&r1=1212626&r2=1212627&view=diff ============================================================================== --- cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/SystemTable.java (original) +++ cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/SystemTable.java Fri Dec 9 21:00:58 2011 @@ -100,7 +100,7 @@ public class SystemTable */ public static synchronized void updateToken(InetAddress ep, Token token) { - if (ep == FBUtilities.getBroadcastAddress()) + if (ep == FBUtilities.getLocalAddress()) return; IPartitioner p = StorageService.getPartitioner(); ColumnFamily cf = ColumnFamily.create(Table.SYSTEM_TABLE, STATUS_CF); Modified: cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/gms/Gossiper.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/gms/Gossiper.java?rev=1212627&r1=1212626&r2=1212627&view=diff ============================================================================== --- cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/gms/Gossiper.java (original) +++ cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/gms/Gossiper.java Fri Dec 9 21:00:58 2011 @@ -995,7 +995,7 @@ public class Gossiper implements IFailur */ public void addSavedEndpoint(InetAddress ep) { - if (ep == FBUtilities.getBroadcastAddress()) + if (ep == FBUtilities.getLocalAddress()) { logger.debug("Attempt to add self as saved endpoint"); return; Modified: cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/service/StorageService.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/service/StorageService.java?rev=1212627&r1=1212626&r2=1212627&view=diff ============================================================================== --- cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/service/StorageService.java (original) +++ cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/service/StorageService.java Fri Dec 9 21:00:58 2011 @@ -387,7 +387,7 @@ public class StorageService implements I logger_.info("Loading persisted ring state"); for (Map.Entry<Token, InetAddress> entry : SystemTable.loadTokens().entrySet()) { - if (entry.getValue() == FBUtilities.getBroadcastAddress()) + if (entry.getValue() == FBUtilities.getLocalAddress()) { // entry has been mistakenly added, delete it SystemTable.removeToken(entry.getKey());
