Updated Branches: refs/heads/cassandra-2.0 c6c686f41 -> de6a74a2d refs/heads/trunk d4461f832 -> 15d607568
turns out there's already a getLoopbackAddress Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/de6a74a2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/de6a74a2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/de6a74a2 Branch: refs/heads/cassandra-2.0 Commit: de6a74a2d5a475cdb1c3e51f65562880ed705378 Parents: c6c686f Author: Jonathan Ellis <jbel...@apache.org> Authored: Wed Feb 12 15:50:33 2014 -0600 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Wed Feb 12 15:50:33 2014 -0600 ---------------------------------------------------------------------- .../org/apache/cassandra/service/CassandraDaemon.java | 2 +- src/java/org/apache/cassandra/utils/FBUtilities.java | 12 ------------ 2 files changed, 1 insertion(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/de6a74a2/src/java/org/apache/cassandra/service/CassandraDaemon.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/CassandraDaemon.java b/src/java/org/apache/cassandra/service/CassandraDaemon.java index 23bf3e5..b3f7ff3 100644 --- a/src/java/org/apache/cassandra/service/CassandraDaemon.java +++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java @@ -373,7 +373,7 @@ public class CassandraDaemon } } - if (!FBUtilities.getBroadcastAddress().equals(FBUtilities.getLoopback())) + if (!FBUtilities.getBroadcastAddress().equals(InetAddress.getLoopbackAddress())) waitForGossipToSettle(); // Thift http://git-wip-us.apache.org/repos/asf/cassandra/blob/de6a74a2/src/java/org/apache/cassandra/utils/FBUtilities.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/utils/FBUtilities.java b/src/java/org/apache/cassandra/utils/FBUtilities.java index 0cacfe2..579f5fa 100644 --- a/src/java/org/apache/cassandra/utils/FBUtilities.java +++ b/src/java/org/apache/cassandra/utils/FBUtilities.java @@ -693,16 +693,4 @@ public class FBUtilities { return OPERATING_SYSTEM.contains("nix") || OPERATING_SYSTEM.contains("nux") || OPERATING_SYSTEM.contains("aix"); } - - public static InetAddress getLoopback() - { - try - { - return InetAddress.getByName(null); - } - catch (UnknownHostException e) - { - throw new AssertionError(e); - } - } }
