Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 893c11f54 -> 89bccb6f7
avoid reinitiating gossip when nothings changed Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/89bccb6f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/89bccb6f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/89bccb6f Branch: refs/heads/cassandra-2.1 Commit: 89bccb6f7b34667668db6a41f34fa24c94faf0d2 Parents: 893c11f Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Sat Mar 8 21:20:35 2014 -0500 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Sat Mar 8 21:20:35 2014 -0500 ---------------------------------------------------------------------- .../org/apache/cassandra/locator/GossipingPropertyFileSnitch.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/89bccb6f/src/java/org/apache/cassandra/locator/GossipingPropertyFileSnitch.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/locator/GossipingPropertyFileSnitch.java b/src/java/org/apache/cassandra/locator/GossipingPropertyFileSnitch.java index 720e804..2c0980a 100644 --- a/src/java/org/apache/cassandra/locator/GossipingPropertyFileSnitch.java +++ b/src/java/org/apache/cassandra/locator/GossipingPropertyFileSnitch.java @@ -174,7 +174,7 @@ public class GossipingPropertyFileSnitch extends AbstractNetworkTopologySnitch// newRack = newRack.trim(); final boolean newPreferLocal = Boolean.parseBoolean(properties.get("prefer_local", "false")); - if (myDC != newDc || myRack != newRack || (preferLocal != newPreferLocal)) + if (!newDc.equals(myDC) || !newRack.equals(myRack) || (preferLocal != newPreferLocal)) { myDC = newDc; myRack = newRack;
