You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ta...@apache.org on 2015/01/15 19:51:45 UTC
qpid-jms git commit: Few more fixes
Repository: qpid-jms
Updated Branches:
refs/heads/master d08df5c1e -> 1a986c68c
Few more fixes
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/1a986c68
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/1a986c68
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/1a986c68
Branch: refs/heads/master
Commit: 1a986c68ce56056db08408e1ab6030745b09cc42
Parents: d08df5c
Author: Timothy Bish <ta...@gmail.com>
Authored: Thu Jan 15 13:50:06 2015 -0500
Committer: Timothy Bish <ta...@gmail.com>
Committed: Thu Jan 15 13:50:06 2015 -0500
----------------------------------------------------------------------
.../discovery/multicast/MulticastDiscoveryAgent.java | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/1a986c68/qpid-jms-discovery/src/main/java/org/apache/qpid/jms/provider/discovery/multicast/MulticastDiscoveryAgent.java
----------------------------------------------------------------------
diff --git a/qpid-jms-discovery/src/main/java/org/apache/qpid/jms/provider/discovery/multicast/MulticastDiscoveryAgent.java b/qpid-jms-discovery/src/main/java/org/apache/qpid/jms/provider/discovery/multicast/MulticastDiscoveryAgent.java
index cacd1af..b9ebd31 100644
--- a/qpid-jms-discovery/src/main/java/org/apache/qpid/jms/provider/discovery/multicast/MulticastDiscoveryAgent.java
+++ b/qpid-jms-discovery/src/main/java/org/apache/qpid/jms/provider/discovery/multicast/MulticastDiscoveryAgent.java
@@ -142,17 +142,22 @@ public class MulticastDiscoveryAgent implements DiscoveryAgent, Runnable {
if (mcJoinNetworkInterface != null) {
mcast.joinGroup(sockAddress, NetworkInterface.getByName(mcJoinNetworkInterface));
} else {
+ if (mcNetworkInterface != null) {
+ mcast.setNetworkInterface(NetworkInterface.getByName(mcNetworkInterface));
+ } else {
+ trySetNetworkInterface(mcast);
+ }
mcast.joinGroup(inetAddress);
}
mcast.setSoTimeout((int) keepAliveInterval);
if (mcInterface != null) {
mcast.setInterface(InetAddress.getByName(mcInterface));
}
+
if (mcNetworkInterface != null) {
mcast.setNetworkInterface(NetworkInterface.getByName(mcNetworkInterface));
- } else {
- trySetNetworkInterface(mcast);
}
+
runner = new Thread(this);
runner.setName(this.toString() + ":" + runner.getName());
runner.setDaemon(true);
@@ -377,17 +382,19 @@ public class MulticastDiscoveryAgent implements DiscoveryAgent, Runnable {
private void trySetNetworkInterface(MulticastSocket mcastSock) throws SocketException {
List<NetworkInterface> interfaces = findNetworkInterface();
SocketException lastError = null;
+ boolean found = false;
for (NetworkInterface networkInterface : interfaces) {
try {
mcastSock.setNetworkInterface(networkInterface);
+ found = true;
break;
} catch (SocketException error) {
lastError = error;
}
}
- if (mcastSock.getNetworkInterface() == null) {
+ if (!found) {
if (lastError != null) {
throw lastError;
} else {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org