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

[Ron Sigal]

  User: rsigal  
  Date: 07/02/25 15:54:50

  Modified:    src/main/org/jboss/remoting/transport/socket  Tag:
                        remoting_2_x MicroSocketClientInvoker.java
  Log:
  JBREM-690:  Treat version == SocketWrapper.CLOSING as end of file.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.16.2.25 +7 -2      JBossRemoting/src/main/org/jboss/remoting/transport/socket/MicroSocketClientInvoker.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: MicroSocketClientInvoker.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/transport/socket/MicroSocketClientInvoker.java,v
  retrieving revision 1.16.2.24
  retrieving revision 1.16.2.25
  diff -u -b -r1.16.2.24 -r1.16.2.25
  --- MicroSocketClientInvoker.java	21 Feb 2007 09:44:37 -0000	1.16.2.24
  +++ MicroSocketClientInvoker.java	25 Feb 2007 20:54:50 -0000	1.16.2.25
  @@ -36,7 +36,7 @@
    * @author <a href="mailto:telrod at e2technologies.net">Tom Elrod</a>
    * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
    *
  - * @version $Revision: 1.16.2.24 $
  + * @version $Revision: 1.16.2.25 $
    */
   public class MicroSocketClientInvoker extends RemoteClientInvoker
   {
  @@ -569,6 +569,11 @@
                     {
                        throw new SocketException("end of file");
                     }
  +                  if (version == SocketWrapper.CLOSING)
  +                  {
  +                     log.info("Received version 254: treating as end of file");
  +                     throw new SocketException("end of file");
  +                  }
                  }
   
                  response = versionedRead(inputStream, unmarshaller, version);
  @@ -763,8 +768,8 @@
               if (usedPooled < maxPoolSize)
               {
                  // Try to get a socket.
  -               usedPooled++;
                  if (trace) log.trace(this + " getting a socket, usedPooled: " + usedPooled);
  +               usedPooled++;
               }
               else
               {