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

[Ron Sigal]

  User: rsigal  
  Date: 07/08/04 19:11:06

  Modified:    src/main/org/jboss/remoting/transport/bisocket  Tag:
                        remoting_2_2_0_GA BisocketServerInvoker.java
  Log:
  JBREM-784: Uses new RECREATE_CONTROL_SOCKET and uses new version of BisocketClientInvoker.transferSocket().  Added some logging.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.17.2.6 +28 -15    JBossRemoting/src/main/org/jboss/remoting/transport/bisocket/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/BisocketServerInvoker.java,v
  retrieving revision 1.1.2.17.2.5
  retrieving revision 1.1.2.17.2.6
  diff -u -b -r1.1.2.17.2.5 -r1.1.2.17.2.6
  --- BisocketServerInvoker.java	29 Jul 2007 05:45:41 -0000	1.1.2.17.2.5
  +++ BisocketServerInvoker.java	4 Aug 2007 23:11:05 -0000	1.1.2.17.2.6
  @@ -58,7 +58,7 @@
   /**
    *
    * @author <a href="ron.sigal at jboss.com">Ron Sigal</a>
  - * @version $Revision: 1.1.2.17.2.5 $
  + * @version $Revision: 1.1.2.17.2.6 $
    * <p>
    * Copyright Nov 23, 2006
    * </p>
  @@ -279,13 +279,14 @@
         DataOutputStream dos = new DataOutputStream(socket.getOutputStream());
         if (firstConnection)
         {
  -         dos.write(Bisocket.CREATE_ORDINARY_SOCKET);
  +         dos.write(Bisocket.CREATE_CONTROL_SOCKET);
         }
         else
         {
  -         dos.write(Bisocket.CREATE_CONTROL_SOCKET);
  +         dos.write(Bisocket.RECREATE_CONTROL_SOCKET);
         }
         dos.writeUTF(listenerId);
  +      
         Thread thread = new ControlConnectionThread(socket, listenerId);
         thread.setName("control: " + socket.toString());
         thread.setDaemon(true);
  @@ -308,7 +309,7 @@
         }
   
         thread.start();
  -      log.debug("created control connection: " + socket.toString());
  +      log.debug(this + " created control connection (" + listenerId + "): " + socket.toString());
      }
   
   
  @@ -324,6 +325,7 @@
         if (t != null)
         {
            ((ControlConnectionThread)t).shutdown();
  +         log.debug(this + " shutting down control connection: " + listenerId);
         }
         else
         {
  @@ -406,6 +408,7 @@
               try
               {
                  pingFrequency = Integer.valueOf(((String) o)).intValue();
  +               log.debug(this + " setting pingFrequency to " + pingFrequency);
               }
               catch (NumberFormatException e)
               {
  @@ -423,6 +426,7 @@
               try
               {
                  pingWindowFactor = Integer.valueOf(((String) o)).intValue();
  +               log.debug(this + " setting pingWindowFactor to " + pingWindowFactor);
               }
               catch (NumberFormatException e)
               {
  @@ -732,7 +736,8 @@
                        return;
   
                     default:
  -                     log.error("unrecognized action: " + action);
  +                     log.error("unrecognized action on ControlConnectionThread (" +
  +                               listenerId + "): " +  action);
                        continue;
                  }
               }
  @@ -814,7 +819,7 @@
               try
               {
                  Socket socket = secondaryServerSocket.accept();
  -               log.debug("accepted: " + socket);
  +               if (log.isTraceEnabled()) log.trace("accepted: " + socket);
                  DataInputStream dis = new DataInputStream(socket.getInputStream());
                  int action = dis.read();
                  String listenerId = dis.readUTF();
  @@ -822,27 +827,33 @@
                  switch (action)
                  {
                     case Bisocket.CREATE_CONTROL_SOCKET:
  -                     BisocketClientInvoker invoker;
  -                     invoker =  BisocketClientInvoker.getBisocketCallbackClientInvoker(listenerId);
  +                     BisocketClientInvoker.transferSocket(listenerId, socket, true);
  +                     if (log.isTraceEnabled()) 
  +                        log.trace("SecondaryServerSocketThread: created control socket: (" + socket + ")"+ listenerId);
  +                     break;
  +                     
  +                  case Bisocket.RECREATE_CONTROL_SOCKET:
  +                     BisocketClientInvoker invoker =  BisocketClientInvoker.getBisocketCallbackClientInvoker(listenerId);
                        if (invoker == null)
                        {
  -                        log.debug("SecondaryServerSocketThread: transferring socket: " + listenerId);
  -                        BisocketClientInvoker.transferSocket(listenerId, socket);
  +                        log.error("received new control socket for unrecognized listenerId: " + listenerId);
                        }
                        else
                        {
                           invoker.replaceControlSocket(socket);
  -                        log.debug("SecondaryServerSocketThread: created secondary socket: " + listenerId);
  +                        if (log.isTraceEnabled())
  +                           log.trace("SecondaryServerSocketThread: recreated control socket: " + listenerId);
                        }
                        break;
   
                     case Bisocket.CREATE_ORDINARY_SOCKET:
  -                     BisocketClientInvoker.transferSocket(listenerId, socket);
  -                     log.debug("SecondaryServerSocketThread: transferred socket: " + listenerId);
  +                     BisocketClientInvoker.transferSocket(listenerId, socket, false);
  +                     if (log.isTraceEnabled())
  +                        log.trace("SecondaryServerSocketThread: transferred socket: " + listenerId);
                        break;
   
                     default:
  -                     log.error("unrecognized action: " + action);
  +                     log.error("unrecognized action on SecondaryServerSocketThread: " + action);
                  }
               }
               catch (IOException e)
  @@ -950,7 +961,9 @@
                        continue;
                     }
                     
  -                  log.warn(this + ": detected failure on control connection " + t + ": requesting new control connection");
  +                  log.warn(this + ": detected failure on control connection " + t + 
  +                                  " (" + listenerId + 
  +                                  ": requesting new control connection");
                  }
                  
                  Thread t2 = new Thread()