Repository: qpid-jms Updated Branches: refs/heads/master 71716b8db -> 8b9ab1491
QPIDJMS-76: configure broker to use the same interface as the JUnit assumption check did, ensure there isn't a mismatch in multihomed environments Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/8b9ab149 Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/8b9ab149 Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/8b9ab149 Branch: refs/heads/master Commit: 8b9ab1491b6de9c4e75d2926e8dca75c951b2d32 Parents: 49b6674 Author: Robert Gemmell <rob...@apache.org> Authored: Wed Jun 24 14:36:56 2015 +0100 Committer: Robert Gemmell <rob...@apache.org> Committed: Wed Jun 24 14:51:05 2015 +0100 ---------------------------------------------------------------------- .../apache/qpid/jms/discovery/JmsAmqpDiscoveryTest.java | 8 ++++++++ .../java/org/apache/qpid/jms/support/AmqpTestSupport.java | 10 +++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/8b9ab149/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/discovery/JmsAmqpDiscoveryTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/discovery/JmsAmqpDiscoveryTest.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/discovery/JmsAmqpDiscoveryTest.java index d1d8360..70f0ca7 100644 --- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/discovery/JmsAmqpDiscoveryTest.java +++ b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/discovery/JmsAmqpDiscoveryTest.java @@ -55,6 +55,8 @@ public class JmsAmqpDiscoveryTest extends AmqpTestSupport implements JmsConnecti private static final Logger LOG = LoggerFactory.getLogger(JmsAmqpDiscoveryTest.class); private static boolean multicastWorking = false; + private static String networkInterface = null; + static { String host = MulticastDiscoveryAgent.DEFAULT_HOST_IP; @@ -91,6 +93,7 @@ public class JmsAmqpDiscoveryTest extends AmqpTestSupport implements JmsConnecti if(packetIn.getLength() > 0) { LOG.info("Received packet with content, multicast seems to be working!"); success = true; + networkInterface = mcastRcv.getNetworkInterface().getName(); } else { LOG.info("Received packet without content, lets assume multicast isnt working!"); } @@ -227,6 +230,11 @@ public class JmsAmqpDiscoveryTest extends AmqpTestSupport implements JmsConnecti return true; } + @Override + protected String getDiscoveryNetworkInterface() { + return networkInterface; + } + protected Connection createFailingConnection() throws JMSException { String discoveryPrefix = DiscoveryProviderFactory.DISCOVERY_OPTION_PREFIX; JmsConnectionFactory factory = new JmsConnectionFactory( http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/8b9ab149/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/support/AmqpTestSupport.java ---------------------------------------------------------------------- diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/support/AmqpTestSupport.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/support/AmqpTestSupport.java index fb7ade1..bc8b855 100644 --- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/support/AmqpTestSupport.java +++ b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/support/AmqpTestSupport.java @@ -37,6 +37,10 @@ public class AmqpTestSupport extends QpidJmsTestSupport { return false; } + protected String getDiscoveryNetworkInterface() { + return null; + } + protected String getAmqpTransformer() { return "jms"; } @@ -60,7 +64,11 @@ public class AmqpTestSupport extends QpidJmsTestSupport { "&transport.socketBufferSize=" + getSocketBufferSize() + "&ioBufferSize=" + getIOBufferSize()); connector.setName("amqp"); if (isAmqpDiscovery()) { - connector.setDiscoveryUri(new URI("multicast://default")); + String uriString = "multicast://default"; + if(getDiscoveryNetworkInterface() != null) { + uriString += "?networkInterface=" + getDiscoveryNetworkInterface(); + } + connector.setDiscoveryUri(new URI(uriString)); } port = connector.getPublishableConnectURI().getPort(); LOG.debug("Using amqp port: {}", port); --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
