Repository: activemq Updated Branches: refs/heads/master 991d69f38 -> daf7e85e6
https://issues.apache.org/jira/browse/AMQ-6297 - null check for case where interface has no bindings Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/daf7e85e Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/daf7e85e Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/daf7e85e Branch: refs/heads/master Commit: daf7e85e68e2403bc9e86948ae38adaa3e55ad69 Parents: 991d69f Author: gtully <[email protected]> Authored: Fri May 20 14:54:04 2016 +0100 Committer: gtully <[email protected]> Committed: Fri May 20 14:54:04 2016 +0100 ---------------------------------------------------------------------- .../transport/discovery/multicast/MulticastDiscoveryAgent.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/daf7e85e/activemq-client/src/main/java/org/apache/activemq/transport/discovery/multicast/MulticastDiscoveryAgent.java ---------------------------------------------------------------------- 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 48b15e2..a29c3b4 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);
