You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2012/02/15 16:45:44 UTC
[3/4] git commit: Correct InetAddress equality comparisons. Patch by
brandonwilliams reviewed by jbellis for CASSANDRA-3913
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/984194d0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/984194d0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/984194d0
Branch: refs/heads/cassandra-1.1
Commit: 984194d0c62e922d4600046456df7aa3a85ca4f1
Parents: b3bc28b
Author: Brandon Williams <br...@apache.org>
Authored: Wed Feb 15 09:06:52 2012 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Feb 15 09:07:33 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/984194d0/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 7e13fc4..628719b 100644
--- a/src/java/org/apache/cassandra/db/SystemTable.java
+++ b/src/java/org/apache/cassandra/db/SystemTable.java
@@ -138,7 +138,7 @@ public class SystemTable
*/
public static synchronized void updateToken(InetAddress ep, Token token)
{
- if (ep == FBUtilities.getBroadcastAddress())
+ if (ep.equals(FBUtilities.getBroadcastAddress()))
{
removeToken(token);
return;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/984194d0/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 96576fb..9dd73ac 100644
--- a/src/java/org/apache/cassandra/gms/Gossiper.java
+++ b/src/java/org/apache/cassandra/gms/Gossiper.java
@@ -1095,7 +1095,7 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean
*/
public void addSavedEndpoint(InetAddress ep)
{
- if (ep == FBUtilities.getBroadcastAddress())
+ if (ep.equals(FBUtilities.getBroadcastAddress()))
{
logger.debug("Attempt to add self as saved endpoint");
return;