[jboss-cvs] jboss/src/main/org/jboss/invocation/pooled/interfaces ...

[Scott S. <sco...@jb...>]

  User: starksm 
  Date: 06/04/11 19:58:31

  Modified:    src/main/org/jboss/invocation/pooled/interfaces 
                        PooledInvokerProxy.java
  Log:
  JBAS-3089, correct the handling of the returnConnection value.
  
  Revision  Changes    Path
  1.15      +6 -2      jboss/src/main/org/jboss/invocation/pooled/interfaces/PooledInvokerProxy.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: PooledInvokerProxy.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/invocation/pooled/interfaces/PooledInvokerProxy.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -b -r1.14 -r1.15
  --- PooledInvokerProxy.java	11 Apr 2006 21:46:55 -0000	1.14
  +++ PooledInvokerProxy.java	11 Apr 2006 23:58:31 -0000	1.15
  @@ -63,7 +63,7 @@
    *
    * @author <a href="mailto:bi...@jb...">Bill Burke</a>
    * @author Sco...@jb...
  - * @version $Revision: 1.14 $
  + * @version $Revision: 1.15 $
    */
   public class PooledInvokerProxy
      implements Invoker, Externalizable
  @@ -223,6 +223,8 @@
         {
            if (socket != null)
            {
  +            if( trace )
  +               log.trace("Closing socket in finalize: "+socket);
               try { socket.close(); } catch (Exception ignored) {}
            }
         }
  @@ -569,9 +571,11 @@
         }
   
         // Put socket back in pool for reuse
  -      if( returnConnection(socket) )
  +      if( returnConnection(socket) == false )
         {
            // Failed, close the socket
  +         if( trace )
  +            log.trace("Closing unpooled socket: "+socket);
            try
            {
               socket.socket.close();