You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by rw...@apache.org on 2003/03/06 19:59:12 UTC

cvs commit: jakarta-commons/dbcp/src/java/org/apache/commons/dbcp AbandonedObjectPool.java

rwaldhoff    2003/03/06 10:59:12

  Modified:    dbcp     project.xml
               dbcp/src/java/org/apache/commons/dbcp
                        AbandonedObjectPool.java
  Log:
  * override invalidateObject in AbandonedObjectPool to remove the object from the tracked set
  * change maven descriptor to reference pool-SNAPSHOT
  
  Revision  Changes    Path
  1.7       +1 -1      jakarta-commons/dbcp/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/dbcp/project.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- project.xml	31 Dec 2002 05:51:29 -0000	1.6
  +++ project.xml	6 Mar 2003 18:59:12 -0000	1.7
  @@ -66,7 +66,7 @@
       
       <dependency>
         <id>commons-pool</id>
  -      <version>1.0</version>
  +      <version>SNAPSHOT</version>
       </dependency>
       
       <dependency>
  
  
  
  1.3       +11 -4     jakarta-commons/dbcp/src/java/org/apache/commons/dbcp/AbandonedObjectPool.java
  
  Index: AbandonedObjectPool.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/dbcp/src/java/org/apache/commons/dbcp/AbandonedObjectPool.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- AbandonedObjectPool.java	23 Jun 2002 21:41:42 -0000	1.2
  +++ AbandonedObjectPool.java	6 Mar 2003 18:59:12 -0000	1.3
  @@ -140,6 +140,13 @@
           super.returnObject(obj);
       }
   
  +    public synchronized void invalidateObject(Object obj) throws Exception {
  +        if (config != null && config.getRemoveAbandoned()) {
  +            trace.remove(obj);
  +        }
  +        super.invalidateObject(obj);        
  +    }
  +    
       /**
        * Recover abandoned db connections which have been idle
        * greater than the removeAbandonedTimeout.
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org