[hornetq-commits] JBoss hornetq SVN: r9110 - in trunk/src/main/org/hornetq/core: server/cluster/impl and 1 other directory.

[do-not-reply at jboss.org]

Author: timfox
Date: 2010-04-14 07:54:24 -0400 (Wed, 14 Apr 2010)
New Revision: 9110

Modified:
   trunk/src/main/org/hornetq/core/cluster/impl/DiscoveryGroupImpl.java
   trunk/src/main/org/hornetq/core/server/cluster/impl/BroadcastGroupImpl.java
Log:
https://jira.jboss.org/jira/browse/HORNETQ-342

Modified: trunk/src/main/org/hornetq/core/cluster/impl/DiscoveryGroupImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/cluster/impl/DiscoveryGroupImpl.java	2010-04-14 09:07:05 UTC (rev 9109)
+++ trunk/src/main/org/hornetq/core/cluster/impl/DiscoveryGroupImpl.java	2010-04-14 11:54:24 UTC (rev 9110)
@@ -114,16 +114,12 @@
          return;
       }
 
-      if (localBindAddress == null)
+      socket = new MulticastSocket(groupPort);
+
+      if (localBindAddress != null)
       {
-         socket = new MulticastSocket(groupPort);
+         socket.setInterface(localBindAddress);
       }
-      else
-      {
-         InetSocketAddress saddress = new InetSocketAddress(localBindAddress, groupPort);
-         
-         socket = new MulticastSocket(saddress);
-      }
 
       socket.joinGroup(groupAddress);
 

Modified: trunk/src/main/org/hornetq/core/server/cluster/impl/BroadcastGroupImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/server/cluster/impl/BroadcastGroupImpl.java	2010-04-14 09:07:05 UTC (rev 9109)
+++ trunk/src/main/org/hornetq/core/server/cluster/impl/BroadcastGroupImpl.java	2010-04-14 11:54:24 UTC (rev 9110)
@@ -119,6 +119,11 @@
       }
       else
       {
+         if (localAddress != null)
+         {
+            log.warn("local-bind-address specified for broadcast group but no local-bind-port specified so socket will NOT be bound " + 
+                     "to a local address/port");
+         }
          socket = new DatagramSocket();
       }