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

[Ron Sigal]

  User: rsigal  
  Date: 07/02/06 00:10:38

  Modified:    src/main/org/jboss/remoting/transport/socket 
                        ClientSocketWrapper.java
  Log:
  JBREM-598:  In createStreams() restore timeout in finally clause.
  
  Revision  Changes    Path
  1.20      +14 -6     JBossRemoting/src/main/org/jboss/remoting/transport/socket/ClientSocketWrapper.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ClientSocketWrapper.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/transport/socket/ClientSocketWrapper.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -b -r1.19 -r1.20
  --- ClientSocketWrapper.java	4 Feb 2007 22:28:57 -0000	1.19
  +++ ClientSocketWrapper.java	6 Feb 2007 05:10:38 -0000	1.20
  @@ -24,8 +24,6 @@
   
   import java.io.IOException;
   import java.io.InputStream;
  -import java.io.ObjectInputStream;
  -import java.io.ObjectOutputStream;
   import java.io.OutputStream;
   import java.net.Socket;
   import java.util.Map;
  @@ -112,7 +110,9 @@
   
      public String toString()
      {
  -      return "ClientSocketWrapper[" + getSocket() + "]";
  +      Socket socket = getSocket();
  +      return "ClientSocketWrapper[" + socket + "." +
  +         Integer.toHexString(System.identityHashCode(socket)) + "]";
      }
   
      // Package protected ----------------------------------------------------------------------------
  @@ -153,13 +153,21 @@
               if (tempTimeout != -1)
               {
                  socket.setSoTimeout(tempTimeout);
  +               log.debug("set temp timeout to: " + tempTimeout);
               }
            }
         }
         
  +      try
  +      {
         out = createOutputStream(serializationType, socket, marshaller);
         in = createInputStream(serializationType, socket, unmarshaller);
  +      }
  +      finally
  +      {
         setTimeout(savedTimeout);
  +         log.debug("reset timeout: " + savedTimeout);
  +      }
      }
   
      protected InputStream createInputStream(String serializationType, Socket socket, UnMarshaller unmarshaller)