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

[Ron Sigal]

  User: rsigal  
  Date: 07/01/30 22:58:02

  Modified:    src/main/org/jboss/remoting/transport/socket  Tag:
                        remoting_2_x MicroSocketClientInvoker.java
  Log:
  JBREM-694:  Corrected handling of timeout in creation of ServerAddress.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.16.2.17 +14 -5     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.16
  retrieving revision 1.16.2.17
  diff -u -b -r1.16.2.16 -r1.16.2.17
  --- MicroSocketClientInvoker.java	30 Jan 2007 07:41:41 -0000	1.16.2.16
  +++ MicroSocketClientInvoker.java	31 Jan 2007 03:58:02 -0000	1.16.2.17
  @@ -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.16 $
  + * @version $Revision: 1.16.2.17 $
    */
   public class MicroSocketClientInvoker extends RemoteClientInvoker
   {
  @@ -359,7 +359,7 @@
   
         configureParameters();
   
  -      address = new ServerAddress(addr.getHostAddress(), port, enableTcpNoDelay, -1);
  +      address = createServerAddress();
      }
   
      protected void configureParameters()
  @@ -427,6 +427,11 @@
         }
      }
   
  +   protected ServerAddress createServerAddress()
  +   {
  +      return new ServerAddress(addr.getHostAddress(), port, enableTcpNoDelay, -1);
  +   }
  +   
      protected void finalize() throws Throwable
      {
         disconnect();
  @@ -465,7 +470,7 @@
   
         if(metadata != null)
         {
  -         // check to see if is one way invocation and return if is
  +         // check to see if is one way invocation and return after writing invocation if is
            Object val = metadata.get(org.jboss.remoting.Client.ONEWAY_FLAG);
            if(val != null && val instanceof String && Boolean.valueOf((String)val).booleanValue())
            {
  @@ -535,7 +540,11 @@
               writeTime += end;
               start = System.currentTimeMillis();
   
  -            if (!oneway)
  +            if (oneway)
  +            {
  +               if(trace) { log.trace(this + " sent oneway invocation, so not waiting for response, returning null"); }
  +            }
  +            else
               {
                  InputStream inputStream = socketWrapper.getInputStream();
                  if (performVersioning)