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

[Tom Elrod]

  User: telrod  
  Date: 06/08/11 23:41:19

  Modified:    src/main/org/jboss/remoting/transport/socket 
                        MicroSocketClientInvoker.java
  Log:
  JBREM-576 - fix for potential deadlock with socket client invoker.
  
  Revision  Changes    Path
  1.13      +31 -31    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.12
  retrieving revision 1.13
  diff -u -b -r1.12 -r1.13
  --- MicroSocketClientInvoker.java	24 Jul 2006 02:07:56 -0000	1.12
  +++ MicroSocketClientInvoker.java	12 Aug 2006 03:41:19 -0000	1.13
  @@ -30,7 +30,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.12 $
  + * @version $Revision: 1.13 $
    */
   public class MicroSocketClientInvoker extends RemoteClientInvoker
   {
  @@ -652,12 +652,13 @@
               if (pool.size() > 0)
               {
                  pooled = getPooledConnection();
  +            }
  +         }
                  if (pooled != null)
                  {
                     usedPooled++;
                     break;
                  }
  -            }
               else if (usedPooled < maxPoolSize)
               {
                  // if no connection in pool and all pooled connections
  @@ -689,7 +690,6 @@
                  usedPooled++;
                  break;
               }
  -         }
            // waiting 1 second (numberOfRetries along with 1 second wait determines timeout on getting pooled connection)
            Thread.sleep(1000);
         }