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

[Ron Sigal]

  User: rsigal  
  Date: 07/01/17 21:48:07

  Modified:    src/main/org/jboss/remoting/transport/socket  Tag:
                        remoting_2_x MicroSocketClientInvoker.java
  Log:
  JBREM-662:  In getConnection() moved bailOut test to beginning of loop.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.16.2.7  +7 -7      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.6
  retrieving revision 1.16.2.7
  diff -u -b -r1.16.2.6 -r1.16.2.7
  --- MicroSocketClientInvoker.java	16 Jan 2007 08:15:05 -0000	1.16.2.6
  +++ MicroSocketClientInvoker.java	18 Jan 2007 02:48:07 -0000	1.16.2.7
  @@ -32,7 +32,7 @@
    *
    * @author <a href="mailto:jhaynie at vocalocity.net">Jeff Haynie</a>
    * @author <a href="mailto:telrod at e2technologies.net">Tom Elrod</a>
  - * @version $Revision: 1.16.2.6 $
  + * @version $Revision: 1.16.2.7 $
    */
   public class MicroSocketClientInvoker extends RemoteClientInvoker
   {
  @@ -683,6 +683,13 @@
         //
         for (int i = 0; i < numberOfRetries; i++)
         {
  +         if (bailOut)
  +         {
  +            log.debug(this + " has been concurrently disconnected, " +
  +               "bailing out from trying to create a new connection");
  +            break;
  +         }
  +         
            synchronized (pool)
            {
               // if connection within pool, use it
  @@ -706,13 +713,6 @@
                  // will be latered returned to the pool (thus filling out
                  // the pool, since starts out empty).
   
  -               if (bailOut)
  -               {
  -                  log.debug(this + " has been concurrently disconnected, " +
  -                     "bailing out from trying to create a new connection");
  -                  break;
  -               }
  -
                  Socket socket = null;
                  long timestamp = System.currentTimeMillis();
                  try