cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [24/50] [abbrv] git commit: Fix broken 3485 commit
Date Thu, 05 Jan 2012 20:00:29 GMT
Fix broken 3485 commit

git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.8@1212627 13f79535-47bb-0310-9956-ffa450edef68


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/27b733ef
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/27b733ef
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/27b733ef

Branch: refs/heads/cassandra-1.0
Commit: 27b733efe27943768064c60867ed6a9a8a1633f5
Parents: 07f539d
Author: Brandon Williams <brandonwilliams@apache.org>
Authored: Fri Dec 9 21:00:58 2011 +0000
Committer: Brandon Williams <brandonwilliams@apache.org>
Committed: Fri Dec 9 21:00:58 2011 +0000

----------------------------------------------------------------------
 src/java/org/apache/cassandra/db/SystemTable.java  |    2 +-
 src/java/org/apache/cassandra/gms/Gossiper.java    |    2 +-
 .../apache/cassandra/service/StorageService.java   |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/27b733ef/src/java/org/apache/cassandra/db/SystemTable.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/SystemTable.java b/src/java/org/apache/cassandra/db/SystemTable.java
index d88c91a..870955f 100644
--- a/src/java/org/apache/cassandra/db/SystemTable.java
+++ b/src/java/org/apache/cassandra/db/SystemTable.java
@@ -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);

http://git-wip-us.apache.org/repos/asf/cassandra/blob/27b733ef/src/java/org/apache/cassandra/gms/Gossiper.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/gms/Gossiper.java b/src/java/org/apache/cassandra/gms/Gossiper.java
index b4d453a..343d7e9 100644
--- a/src/java/org/apache/cassandra/gms/Gossiper.java
+++ b/src/java/org/apache/cassandra/gms/Gossiper.java
@@ -995,7 +995,7 @@ public class Gossiper implements IFailureDetectionEventListener
      */
     public void addSavedEndpoint(InetAddress ep)
     {
-        if (ep == FBUtilities.getBroadcastAddress())
+        if (ep == FBUtilities.getLocalAddress())
         {
             logger.debug("Attempt to add self as saved endpoint");
             return;

http://git-wip-us.apache.org/repos/asf/cassandra/blob/27b733ef/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java
index 15329db..808d6de 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -387,7 +387,7 @@ public class StorageService implements IEndpointStateChangeSubscriber,
StorageSe
             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());


Mime
View raw message