Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

https://issues.apache.org/jira/browse/AMQ-5520 - fix org.apache.activemq.spring.SpringTest.testSenderWithSpringXmlEmbeddedPooledBrokerConfiguredViaXml regression

This commit is contained in:
gtully 2015-02-11 15:51:55 +00:00
parent 25376afac1
commit 07338e7553
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
activemq-client/src/main/java/org/apache/activemq/transport/discovery/multicast/MulticastDiscoveryAgent.java
View File

@ -344,16 +344,18 @@ public class MulticastDiscoveryAgent implements DiscoveryAgent, Runnable {
List<NetworkInterface> possibles = new ArrayList<NetworkInterface>(); List<NetworkInterface> possibles = new ArrayList<NetworkInterface>();
while (ifcs.hasMoreElements()) { while (ifcs.hasMoreElements()) {
NetworkInterface ni = ifcs.nextElement(); NetworkInterface ni = ifcs.nextElement();
if (ni.supportsMulticast() try {
&& ni.isUp()) { if (ni.supportsMulticast()
for (InterfaceAddress ia : ni.getInterfaceAddresses()) { && ni.isUp()) {
if (ia.getAddress() instanceof java.net.Inet4Address for (InterfaceAddress ia : ni.getInterfaceAddresses()) {
&& !ia.getAddress().isLoopbackAddress() if (ia.getAddress() instanceof java.net.Inet4Address
&& !ni.getDisplayName().startsWith("vnic")) { && !ia.getAddress().isLoopbackAddress()
possibles.add(ni); && !ni.getDisplayName().startsWith("vnic")) {
possibles.add(ni);
}
} }
} }
} } catch (SocketException ignored) {}
} }
return possibles.isEmpty() ? null : possibles.get(possibles.size() - 1); return possibles.isEmpty() ? null : possibles.get(possibles.size() - 1);
} }