This is an automated email from the ASF dual-hosted git repository. mck pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 8006ec6f6629e7ea178ad21f80fc70328172bdb2 Merge: 95224b7 9eab263 Author: Mick Semb Wever <[email protected]> AuthorDate: Wed Mar 11 17:37:15 2020 +0100 Merge branch 'cassandra-3.11' into trunk src/java/org/apache/cassandra/utils/GuidGenerator.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --cc src/java/org/apache/cassandra/utils/GuidGenerator.java index b8c3732,9742353..2b3af01 --- a/src/java/org/apache/cassandra/utils/GuidGenerator.java +++ b/src/java/org/apache/cassandra/utils/GuidGenerator.java @@@ -38,12 -36,10 +36,10 @@@ public class GuidGenerato mySecureRand = new SecureRandom(); long secureInitializer = mySecureRand.nextLong(); myRand = new Random(secureInitializer); - try - { - s_id = InetAddress.getLocalHost().toString(); + try { - s_id = FBUtilities.getLocalAddress().toString(); ++ s_id = FBUtilities.getLocalAddressAndPort().toString(); } - catch (UnknownHostException e) - { + catch (RuntimeException e) { throw new AssertionError(e); } } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
