[jboss-cvs] JBoss Messaging SVN: r2288 - branches/Branch_Bisocket_Experiment2/src/main/org/jboss/jms/client/remoting.

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

Author: ron_sigal
Date: 2007-02-13 07:13:21 -0500 (Tue, 13 Feb 2007)
New Revision: 2288

Modified:
   branches/Branch_Bisocket_Experiment2/src/main/org/jboss/jms/client/remoting/JMSRemotingConnection.java
Log:
Integrated bisocket transport.

Modified: branches/Branch_Bisocket_Experiment2/src/main/org/jboss/jms/client/remoting/JMSRemotingConnection.java
===================================================================
--- branches/Branch_Bisocket_Experiment2/src/main/org/jboss/jms/client/remoting/JMSRemotingConnection.java	2007-02-13 12:11:46 UTC (rev 2287)
+++ branches/Branch_Bisocket_Experiment2/src/main/org/jboss/jms/client/remoting/JMSRemotingConnection.java	2007-02-13 12:13:21 UTC (rev 2288)
@@ -32,8 +32,10 @@
 import org.jboss.remoting.ServerInvoker;
 import org.jboss.remoting.callback.CallbackPoller;
 import org.jboss.remoting.callback.InvokerCallbackHandler;
+import org.jboss.remoting.transport.bisocket.Bisocket;
 import org.jboss.remoting.transport.socket.MicroSocketClientInvoker;
 import org.jboss.remoting.transport.socket.SocketServerInvoker;
+import org.jboss.util.id.GUID;
 
 
 /**
@@ -119,6 +121,16 @@
          {
             metadata.put(Client.CALLBACK_SERVER_PORT, propertyPort);
          }
+         
+         String protocol = serverLocator.getProtocol();
+         if ("bisocket".equals(protocol) || "sslbisocket".equals(protocol))
+         {
+            metadata.put(Bisocket.IS_CALLBACK_SERVER, "true");
+            // Setting the port prevents the Remoting Client from using PortUtil.findPort(),
+            // which creates ServerSockets.  The actual value of the port shouldn't matter.
+            if (propertyPort == null)
+               metadata.put(Client.CALLBACK_SERVER_PORT, Integer.toString(new GUID().hashCode()));
+         }
       }
       else
       {
@@ -166,9 +178,12 @@
       throws Throwable
    {
 
-      // For socket transport allow true push callbacks, with callback Connector.
-      // For http transport, simulate push callbacks.
-      boolean doPushCallbacks = "socket".equals(serverLocator.getProtocol());
+      // For transports derived from the socket transport, allow true push callbacks,
+      // with callback Connector.   For http transport, simulate push callbacks.
+      String protocol = serverLocator.getProtocol();
+      boolean isBisocket = "bisocket".equals(protocol) || "sslbisocket".equals(protocol);
+      boolean isSocket   = "socket".equals(protocol)   || "sslsocket".equals(protocol);
+      boolean doPushCallbacks = isBisocket || isSocket;
       Map metadata = createCallbackMetadata(doPushCallbacks, initialMetadata, serverLocator);
 
       if (doPushCallbacks)