activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gtu...@apache.org
Subject activemq git commit: https://issues.apache.org/jira/browse/AMQ-6297 - displayName can also be null - thanks tbish
Date Fri, 20 May 2016 14:33:49 GMT
Repository: activemq
Updated Branches:
  refs/heads/master daf7e85e6 -> 5cc5022d2


https://issues.apache.org/jira/browse/AMQ-6297 - displayName can also be null - thanks tbish


Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/5cc5022d
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/5cc5022d
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/5cc5022d

Branch: refs/heads/master
Commit: 5cc5022d2a2da6e2add8de5c1576a28e97006e87
Parents: daf7e85
Author: gtully <gary.tully@gmail.com>
Authored: Fri May 20 15:33:33 2016 +0100
Committer: gtully <gary.tully@gmail.com>
Committed: Fri May 20 15:33:33 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/5cc5022d/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 a29c3b4..cf1da42 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
@@ -350,7 +350,7 @@ public class MulticastDiscoveryAgent implements DiscoveryAgent, Runnable
{
                     for (InterfaceAddress ia : ni.getInterfaceAddresses()) {
                         if (ia != null && ia.getAddress() instanceof java.net.Inet4Address
                                 && !ia.getAddress().isLoopbackAddress()
-                                && !ni.getDisplayName().startsWith("vnic")) {
+                                && (ni.getDisplayName()==null || !ni.getDisplayName().startsWith("vnic")))
{
                             possibles.add(ni);
                         }
                     }


Mime
View raw message