From: Ron S. <ron...@ya...> - 2005-09-22 20:33:44
|
User: rsigal Date: 05/09/22 16:33:33 Modified: src/main/org/jboss/remoting/transport/multiplex MultiPortVirtualServerSocket.java Log: Answers connect request from SinglePortVirtualServerSocket on dedicated stream. Revision Changes Path 1.15 +5 -6 JBossRemoting/src/main/org/jboss/remoting/transport/multiplex/MultiPortVirtualServerSocket.java (In the diff below, changes in quantity of whitespace are not shown.) Index: MultiPortVirtualServerSocket.java =================================================================== RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/transport/multiplex/MultiPortVirtualServerSocket.java,v retrieving revision 1.14 retrieving revision 1.15 diff -u -b -r1.14 -r1.15 --- MultiPortVirtualServerSocket.java 15 Sep 2005 03:06:58 -0000 1.14 +++ MultiPortVirtualServerSocket.java 22 Sep 2005 20:33:33 -0000 1.15 @@ -8,13 +8,11 @@ */ package org.jboss.remoting.transport.multiplex; -import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; import java.net.InetAddress; import java.net.ServerSocket; import java.net.Socket; -import java.net.SocketTimeoutException; import org.jboss.logging.Logger; @@ -130,7 +128,8 @@ // connection from independent SinglePortVirtualServerSocket if (clientPort.getPort() < 0) { - DataOutputStream os = new DataOutputStream(new MultiplexingOutputStream(manager, SocketId.SERVER_SOCKET_ID)); + DataOutputStream os = new DataOutputStream( + new MultiplexingOutputStream(manager, SocketId.SERVER_SOCKET_CONNECT_ID)); // setCreatedForRemoteServerSocket() prevents the incrementing of referenceCount in MultiplexingManager // when the remote ServerSocket registers itself. Not very nice, really. @@ -138,7 +137,7 @@ try { - protocol.answerConnect(os, SocketId.SERVER_SOCKET_PORT); + protocol.answerConnect(os, SocketId.SERVER_SOCKET_CONNECT_PORT); // Make sure that the remote SinglePortVirtualServerSocket is registered with the // local MultiplexingManager before continuing. This check avoids a race condition @@ -270,7 +269,7 @@ throw new IOException(message); } - DataOutputStream os = new DataOutputStream(new MultiplexingOutputStream(manager, SocketId.SERVER_SOCKET_ID)); + DataOutputStream os = new DataOutputStream(new MultiplexingOutputStream(manager, SocketId.SERVER_SOCKET_CONNECT_ID)); // setCreatedForRemoteServerSocket() prevents the incrementing of referenceCount in MultiplexingManager // when the remote ServerSocket registers itself. Not very nice, really. @@ -278,7 +277,7 @@ try { - protocol.answerConnect(os, SocketId.SERVER_SOCKET_PORT); + protocol.answerConnect(os, SocketId.SERVER_SOCKET_CONNECT_PORT); // Make sure that the remote SinglePortVirtualServerSocket is registered with the // local MultiplexingManager before continuing. This check avoids a race condition |