You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2012/02/15 16:16:46 UTC
git commit: Correct InetAddress equality comparisons. Patch by
brandonwilliams reviewed by jbellis for CASSANDRA-3913
Updated Branches:
refs/heads/cassandra-0.8 038b8f212 -> c0a342bc8
Correct InetAddress equality comparisons.
Patch by brandonwilliams reviewed by jbellis for CASSANDRA-3913
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c0a342bc
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c0a342bc
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c0a342bc
Branch: refs/heads/cassandra-0.8
Commit: c0a342bc85482eb2ae14c15a349188ef27ed98f5
Parents: 038b8f2
Author: Brandon Williams <br...@apache.org>
Authored: Wed Feb 15 09:05:45 2012 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Feb 15 09:05:45 2012 -0600
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/SystemTable.java | 2 +-
src/java/org/apache/cassandra/gms/Gossiper.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c0a342bc/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 870955f..b319f61 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.getLocalAddress())
+ if (ep.equals(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/c0a342bc/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 0f47259..be94f31 100644
--- a/src/java/org/apache/cassandra/gms/Gossiper.java
+++ b/src/java/org/apache/cassandra/gms/Gossiper.java
@@ -996,7 +996,7 @@ public class Gossiper implements IFailureDetectionEventListener
*/
public void addSavedEndpoint(InetAddress ep)
{
- if (ep == FBUtilities.getLocalAddress())
+ if (ep.equals(FBUtilities.getLocalAddress()))
{
logger.debug("Attempt to add self as saved endpoint");
return;