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

[Ron Sigal]

  User: rsigal  
  Date: 07/01/31 03:53:31

  Modified:    src/main/org/jboss/remoting/transport/socket  Tag:
                        remoting_2_x MicroSocketClientInvoker.java
  Log:
  JBREM-598:  In transport() moved timeout reset out of finallly clause where it causes an exception if socket is closed.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.16.2.19 +6 -8      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.18
  retrieving revision 1.16.2.19
  diff -u -b -r1.16.2.18 -r1.16.2.19
  --- MicroSocketClientInvoker.java	31 Jan 2007 08:20:04 -0000	1.16.2.18
  +++ MicroSocketClientInvoker.java	31 Jan 2007 08:53:31 -0000	1.16.2.19
  @@ -35,7 +35,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.18 $
  + * @version $Revision: 1.16.2.19 $
    */
   public class MicroSocketClientInvoker extends RemoteClientInvoker
   {
  @@ -561,6 +561,11 @@
   
               end = System.currentTimeMillis() - start;
               readTime += end;
  +
  +            if (tempTimeout >= 0)
  +            {
  +               socketWrapper.setTimeout(savedTimeout);
  +            }
            }
            catch (SocketException sex)
            {
  @@ -603,13 +608,6 @@
               }
               return handleException(ex, socketWrapper);
            }
  -         finally
  -         {
  -            if (tempTimeout >= 0)
  -            {
  -               socketWrapper.setTimeout(savedTimeout);
  -            }
  -         }
   
            // call worked, so no need to retry
            break;