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

[Ron Sigal]

  User: rsigal  
  Date: 07/01/31 03:20:45

  Modified:    src/main/org/jboss/remoting/transport/socket  Tag:
                        remoting_2_x ClientSocketWrapper.java
  Log:
  JBREM-598: Gets temp timeout in constructor to use during object stream construction.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.15.10.6 +18 -0     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.15.10.5
  retrieving revision 1.15.10.6
  diff -u -b -r1.15.10.5 -r1.15.10.6
  --- ClientSocketWrapper.java	29 Jan 2007 05:17:09 -0000	1.15.10.5
  +++ ClientSocketWrapper.java	31 Jan 2007 08:20:45 -0000	1.15.10.6
  @@ -85,6 +85,11 @@
         // Test to see if socket is alive by send ACK message
         final byte ACK = 1;
   
  +//      out.reset();
  +//      out.writeByte(ACK);
  +//      out.flush();
  +//      in.readByte();
  +
         out.write(ACK);
         out.flush();
         int i = in.read();
  @@ -122,14 +127,27 @@
   
         Marshaller marshaller = null;
         UnMarshaller unmarshaller = null;
  +      int tempTimeout = -1;
  +      int savedTimeout = getTimeout();
  +      
         if (metadata != null)
         {
            marshaller = (Marshaller) metadata.get(MARSHALLER);
            unmarshaller = (UnMarshaller) metadata.get(UNMARSHALLER);
  +         Object o = metadata.get(TEMP_TIMEOUT);
  +         if (o instanceof Integer)
  +         {
  +            tempTimeout = ((Integer) o).intValue();
  +            if (tempTimeout != -1)
  +            {
  +               socket.setSoTimeout(tempTimeout);
  +            }
  +         }
         }
         
         out = createOutputStream(serializationType, socket, marshaller);
         in = createInputStream(serializationType, socket, unmarshaller);
  +      setTimeout(savedTimeout);
      }
   
      protected InputStream createInputStream(String serializationType, Socket socket, UnMarshaller unmarshaller)