From daf7e85e68e2403bc9e86948ae38adaa3e55ad69 Mon Sep 17 00:00:00 2001
From: gtully <gary.tully@gmail.com>
Date: Fri, 20 May 2016 14:54:04 +0100
Subject: [PATCH] https://issues.apache.org/jira/browse/AMQ-6297 - null check
 for case where interface has no bindings

---
 .../transport/discovery/multicast/MulticastDiscoveryAgent.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/activemq-client/src/main/java/org/apache/activemq/transport/discovery/multicast/MulticastDiscoveryAgent.java b/activemq-client/src/main/java/org/apache/activemq/transport/discovery/multicast/MulticastDiscoveryAgent.java
index 48b15e2e3e..a29c3b41dd 100755
--- a/activemq-client/src/main/java/org/apache/activemq/transport/discovery/multicast/MulticastDiscoveryAgent.java
+++ b/activemq-client/src/main/java/org/apache/activemq/transport/discovery/multicast/MulticastDiscoveryAgent.java
@@ -348,7 +348,7 @@ public class MulticastDiscoveryAgent implements DiscoveryAgent, Runnable {
                 if (ni.supportsMulticast()
                         && ni.isUp()) {
                     for (InterfaceAddress ia : ni.getInterfaceAddresses()) {
-                        if (ia.getAddress() instanceof java.net.Inet4Address
+                        if (ia != null && ia.getAddress() instanceof java.net.Inet4Address
                                 && !ia.getAddress().isLoopbackAddress()
                                 && !ni.getDisplayName().startsWith("vnic")) {
                             possibles.add(ni);