[jboss-cvs] JBossAS SVN: r57272 - branches/JBoss_4_0_2_CP/cluster/src/main/org/jboss/ha/jndi

[jboss-cvs-commits at lists.jboss.org]

Author: ryan.campbell at jboss.com
Date: 2006-09-28 22:28:50 -0400 (Thu, 28 Sep 2006)
New Revision: 57272

Modified:
   branches/JBoss_4_0_2_CP/cluster/src/main/org/jboss/ha/jndi/DetachedHANamingService.java
Log:
ASPATCH-76: JBAS-1856: Patch request for: JBAS-1843 - HAJNDI autodiscovery does not respond

Modified: branches/JBoss_4_0_2_CP/cluster/src/main/org/jboss/ha/jndi/DetachedHANamingService.java
===================================================================
--- branches/JBoss_4_0_2_CP/cluster/src/main/org/jboss/ha/jndi/DetachedHANamingService.java	2006-09-29 02:16:35 UTC (rev 57271)
+++ branches/JBoss_4_0_2_CP/cluster/src/main/org/jboss/ha/jndi/DetachedHANamingService.java	2006-09-29 02:28:50 UTC (rev 57272)
@@ -14,7 +14,6 @@
 import java.lang.reflect.UndeclaredThrowableException;
 import java.net.DatagramPacket;
 import java.net.InetAddress;
-import java.net.InetSocketAddress;
 import java.net.MulticastSocket;
 import java.net.ServerSocket;
 import java.net.Socket;
@@ -485,11 +484,12 @@
       {
          stopping = false;
          // Use the jndi bind address if there is no discovery address
-         if (discoveryBindAddress != null)
+         if (discoveryBindAddress == null)
             discoveryBindAddress = bindAddress;
-         InetSocketAddress bindAddr = new InetSocketAddress(discoveryBindAddress,
-            adGroupPort);
-         socket = new MulticastSocket(bindAddr);
+         socket = new MulticastSocket(adGroupPort);
+         // If there is a bind address, set the socket interface to it
+         if( discoveryBindAddress != null )
+            socket.setInterface(discoveryBindAddress);
          socket.setTimeToLive(autoDiscoveryTTL);
          group = InetAddress.getByName(adGroupAddress);
          socket.joinGroup(group);