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

[Ron Sigal]

  User: rsigal  
  Date: 07/07/29 02:45:20

  Modified:    src/main/org/jboss/remoting/transport/bisocket  Tag:
                        remoting_2_2_0_GA BisocketClientInvoker.java
  Log:
  JBREM-774: replaceControlSocket() and handleDisconnect() close control socket.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.13.2.6 +19 -1     JBossRemoting/src/main/org/jboss/remoting/transport/bisocket/BisocketClientInvoker.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: BisocketClientInvoker.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/transport/bisocket/BisocketClientInvoker.java,v
  retrieving revision 1.1.2.13.2.5
  retrieving revision 1.1.2.13.2.6
  diff -u -b -r1.1.2.13.2.5 -r1.1.2.13.2.6
  --- BisocketClientInvoker.java	29 Jul 2007 06:03:16 -0000	1.1.2.13.2.5
  +++ BisocketClientInvoker.java	29 Jul 2007 06:45:19 -0000	1.1.2.13.2.6
  @@ -290,6 +290,18 @@
         {
            if (isCallbackInvoker)
            {
  +            if (controlSocket != null)
  +            {
  +               try
  +               {
  +                  controlSocket.close();
  +               }
  +               catch (IOException e)
  +               {
  +                  log.debug("unable to close control socket: " + controlSocket);
  +               }
  +            }
  +
               listenerIdToCallbackClientInvokerMap.remove(listenerId);
               for (Iterator it = pool.iterator(); it.hasNext();)
               {
  @@ -409,9 +421,15 @@
      {
         synchronized (controlLock)
         {
  +         if (controlSocket != null)
  +         {
  +            controlSocket.close();
  +         }
  +         
  +         log.debug(this + " replacing control socket: " + controlSocket);
            controlSocket = socket;
  +         log.debug(this + " control socket replaced by: " + socket);
            controlOutputStream = controlSocket.getOutputStream();
  -         log.debug("replaced control socket");
         }
   
         if (pingTimerTask != null)