JAVA-1202: Handle null rpc_address when checking schema agreement. (apache#684)

olim7t · web-flow · commit 1516ab4a4c30 · 2016-06-27T11:19:29.000-07:00
diff --git a/changelog/README.md b/changelog/README.md
@@ -11,6 +11,7 @@
 - [bug] JAVA-1187: Fix warning message when local CL used with RoundRobinPolicy.
 - [improvement] JAVA-1175: Warn if DCAwarePolicy configuration is inconsistent.
 - [bug] JAVA-1139: ConnectionException.getMessage() throws NPE if address is null.
+- [bug] JAVA-1202: Handle null rpc_address when checking schema agreement.
 
 
 ### 3.0.2
diff --git a/driver-core/src/main/java/com/datastax/driver/core/ControlConnection.java b/driver-core/src/main/java/com/datastax/driver/core/ControlConnection.java
@@ -383,11 +383,13 @@ private static InetSocketAddress rpcAddressForPeerHost(Row peersRow, InetSocketA
 
         if (broadcastAddress == null) {
             return null;
-        } else if (broadcastAddress.equals(connectedHost.getAddress()) || rpcAddress.equals(connectedHost.getAddress())) {
+        } else if (broadcastAddress.equals(connectedHost.getAddress()) || (rpcAddress != null && rpcAddress.equals(connectedHost.getAddress()))) {
             // Some DSE versions were inserting a line for the local node in peers (with mostly null values). This has been fixed, but if we
             // detect that's the case, ignore it as it's not really a big deal.
             logger.debug("System.peers on node {} has a line for itself. This is not normal but is a known problem of some DSE version. Ignoring the entry.", connectedHost);
             return null;
+        } else if (rpcAddress == null) {
+            return null;
         } else if (rpcAddress.equals(bindAllAddress)) {
             logger.warn("Found host with 0.0.0.0 as rpc_address, using broadcast_address ({}) to contact it instead. If this is incorrect you should avoid the use of 0.0.0.0 server side.", broadcastAddress);
             rpcAddress = broadcastAddress;
