[jboss-cvs] JBossAS SVN: r100938 - projects/naming/branches/Branch_5_0/jnpserver/src/main/java/org/jnp/interfaces.

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

Author: bstansberry at jboss.com
Date: 2010-02-13 10:50:12 -0500 (Sat, 13 Feb 2010)
New Revision: 100938

Modified:
   projects/naming/branches/Branch_5_0/jnpserver/src/main/java/org/jnp/interfaces/NamingContext.java
Log:
[JBNAME-46] Call setInterface on MulticastSocket
[JBNAME-47] Don't join multicast discovery group

Modified: projects/naming/branches/Branch_5_0/jnpserver/src/main/java/org/jnp/interfaces/NamingContext.java
===================================================================
--- projects/naming/branches/Branch_5_0/jnpserver/src/main/java/org/jnp/interfaces/NamingContext.java	2010-02-13 15:49:01 UTC (rev 100937)
+++ projects/naming/branches/Branch_5_0/jnpserver/src/main/java/org/jnp/interfaces/NamingContext.java	2010-02-13 15:50:12 UTC (rev 100938)
@@ -1621,6 +1621,11 @@
          {
             InetSocketAddress localAddr = new InetSocketAddress(localAddrStr, localPort);
             s = new MulticastSocket(localAddr);
+            InetAddress sendAddress = localAddr.getAddress();
+            if (sendAddress.isAnyLocalAddress() == false)
+            {
+               s.setInterface(sendAddress);
+            }
          }
          else
          {
@@ -1630,7 +1635,10 @@
          s.setTimeToLive(ttl);
          if(log.isTraceEnabled())
             log.trace("TTL on multicast discovery socket is " + ttl);
-         s.joinGroup(iaGroup);
+         // JBNAME-47 There is no need to join the group to send to it.
+         // Joining just raises the (slight) possibility of incorrectly receiving
+         // someone else's multicast discovery message instead of unicast reply
+//         s.joinGroup(iaGroup);
          if (trace)
             log.trace("MulticastSocket: " + s);
          DatagramPacket packet;