[jboss-cvs] JBossRemoting/src/main/org/jboss/remoting/transport/bisocket ...

[Ron Sigal]

  User: rsigal  
  Date: 06/12/20 03:21:01

  Modified:    src/main/org/jboss/remoting/transport/bisocket  Tag:
                        remoting_2_x BisocketServerInvoker.java
  Log:
  JBREM-650:  In createControlConnection() send Bisocket.CREATE_CONTROL_SOCKET after first invocation.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.3   +19 -3     JBossRemoting/src/main/org/jboss/remoting/transport/bisocket/Attic/BisocketServerInvoker.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: BisocketServerInvoker.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/transport/bisocket/Attic/BisocketServerInvoker.java,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -b -r1.1.2.2 -r1.1.2.3
  --- BisocketServerInvoker.java	19 Dec 2006 06:09:21 -0000	1.1.2.2
  +++ BisocketServerInvoker.java	20 Dec 2006 08:21:01 -0000	1.1.2.3
  @@ -52,7 +52,7 @@
   /**
    *  
    * @author <a href="ron.sigal at jboss.com">Ron Sigal</a>
  - * @version $Revision: 1.1.2.2 $
  + * @version $Revision: 1.1.2.3 $
    * <p>
    * Copyright Nov 23, 2006
    * </p>
  @@ -144,22 +144,38 @@
      public void createControlConnection(String listenerId, InvokerLocator locator)
      throws IOException
      {
  +      boolean firstConnection;
  +      
         // first connection
         if (locator == null)
  +      {
  +         firstConnection = false;
            locator = (InvokerLocator) listenerIdToInvokerLocatorMap.get(listenerId);
  +      }
         // restarted connection
         else
  +      {
  +         firstConnection = true;
            listenerIdToInvokerLocatorMap.put(listenerId, locator);
  +      }
         
         log.info("creating control connection: " + locator);
  -//      Socket socket = new Socket(locator.getHost(), locator.getPort());
  +      
         Socket socket = null;
         if (socketFactory != null)
            socket = socketFactory.createSocket(locator.getHost(), locator.getPort());
         else
            socket = new Socket(locator.getHost(), locator.getPort());
  +      
         DataOutputStream dos = new DataOutputStream(socket.getOutputStream());
  +      if (firstConnection)
  +      {
         dos.write(Bisocket.CREATE_ORDINARY_SOCKET);
  +      }
  +      else
  +      {
  +         dos.write(Bisocket.CREATE_CONTROL_SOCKET);
  +      }
         dos.writeUTF(listenerId);
         Thread thread = new ControlConnectionThread(socket, listenerId);
         thread.setName("control: " + socket.toString());