[jboss-remoting-commits] JBoss Remoting SVN: r5946 - remoting2/branches/2.x/src/main/org/jboss/remoting/transport/bisocket.

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

Author: ron.sigal at jboss.com
Date: 2010-07-31 22:31:41 -0400 (Sat, 31 Jul 2010)
New Revision: 5946

Modified:
   remoting2/branches/2.x/src/main/org/jboss/remoting/transport/bisocket/BisocketClientInvoker.java
Log:
JBREM-1226: Sockets created by secondary ServerSocket are configured properly.

Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/transport/bisocket/BisocketClientInvoker.java
===================================================================
--- remoting2/branches/2.x/src/main/org/jboss/remoting/transport/bisocket/BisocketClientInvoker.java	2010-07-31 13:44:54 UTC (rev 5945)
+++ remoting2/branches/2.x/src/main/org/jboss/remoting/transport/bisocket/BisocketClientInvoker.java	2010-08-01 02:31:41 UTC (rev 5946)
@@ -26,6 +26,7 @@
 import java.io.OutputStream;
 import java.lang.reflect.Method;
 import java.net.Socket;
+import java.net.SocketException;
 import java.security.AccessController;
 import java.security.PrivilegedActionException;
 import java.security.PrivilegedExceptionAction;
@@ -315,6 +316,14 @@
             it.remove();
             try
             {
+               configureSocket(controlSocket);
+            }
+            catch (SocketException e2)
+            {
+               log.warn(this + " unable to configure control socket: " + e2.getLocalizedMessage());
+            }
+            try
+            {
                controlOutputStream = controlSocket.getOutputStream();
             }
             catch (IOException e1)
@@ -501,6 +510,7 @@
                {
                   Iterator it = sockets.iterator();
                   Socket socket = (Socket) it.next();
+                  configureSocket(socket);
                   it.remove();
                   log.debug(this + " found socket (" + listenerId + "): " + socket);
                   return socket;
@@ -537,6 +547,7 @@
                Iterator it = sockets.iterator();
                Socket socket = (Socket) it.next();
                it.remove();
+               configureSocket(socket);
                log.debug(this + " found socket (" + listenerId + "): " + socket);
                return socket;
             }