Author: sandymac
Date: Sat Apr  1 23:13:42 2006
New Revision: 390792

URL: http://svn.apache.org/viewcvs?rev=390792&view=rev
Log:
maxTotal parameter was sometimes ignored in GenericKeyedObjectPoolFactory

Modified:
    
jakarta/commons/proper/pool/branches/1_3_RELEASE_BRANCH/src/java/org/apache/commons/pool/impl/GenericKeyedObjectPoolFactory.java
    
jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/impl/GenericKeyedObjectPoolFactory.java

Modified: 
jakarta/commons/proper/pool/branches/1_3_RELEASE_BRANCH/src/java/org/apache/commons/pool/impl/GenericKeyedObjectPoolFactory.java
URL: 
http://svn.apache.org/viewcvs/jakarta/commons/proper/pool/branches/1_3_RELEASE_BRANCH/src/java/org/apache/commons/pool/impl/GenericKeyedObjectPoolFactory.java?rev=390792&r1=390791&r2=390792&view=diff
==============================================================================
--- 
jakarta/commons/proper/pool/branches/1_3_RELEASE_BRANCH/src/java/org/apache/commons/pool/impl/GenericKeyedObjectPoolFactory.java
 (original)
+++ 
jakarta/commons/proper/pool/branches/1_3_RELEASE_BRANCH/src/java/org/apache/commons/pool/impl/GenericKeyedObjectPoolFactory.java
 Sat Apr  1 23:13:42 2006
@@ -68,7 +68,7 @@
     }
 
     public GenericKeyedObjectPoolFactory(KeyedPoolableObjectFactory factory, 
int maxActive, byte whenExhaustedAction, long maxWait, int maxIdle, int 
maxTotal, boolean testOnBorrow, boolean testOnReturn, long 
timeBetweenEvictionRunsMillis, int numTestsPerEvictionRun, long 
minEvictableIdleTimeMillis, boolean testWhileIdle) {
-        this(factory, maxActive, whenExhaustedAction, maxWait, maxIdle, 
GenericKeyedObjectPool.DEFAULT_MAX_TOTAL, 
GenericKeyedObjectPool.DEFAULT_MIN_IDLE , testOnBorrow, testOnReturn, 
timeBetweenEvictionRunsMillis, numTestsPerEvictionRun, 
minEvictableIdleTimeMillis, testWhileIdle);
+        this(factory, maxActive, whenExhaustedAction, maxWait, maxIdle, 
maxTotal, GenericKeyedObjectPool.DEFAULT_MIN_IDLE , testOnBorrow, testOnReturn, 
timeBetweenEvictionRunsMillis, numTestsPerEvictionRun, 
minEvictableIdleTimeMillis, testWhileIdle);
     }
 
     public GenericKeyedObjectPoolFactory(KeyedPoolableObjectFactory factory, 
int maxActive, byte whenExhaustedAction, long maxWait, int maxIdle, int 
maxTotal, int minIdle, boolean testOnBorrow, boolean testOnReturn, long 
timeBetweenEvictionRunsMillis, int numTestsPerEvictionRun, long 
minEvictableIdleTimeMillis, boolean testWhileIdle) {

Modified: 
jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/impl/GenericKeyedObjectPoolFactory.java
URL: 
http://svn.apache.org/viewcvs/jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/impl/GenericKeyedObjectPoolFactory.java?rev=390792&r1=390791&r2=390792&view=diff
==============================================================================
--- 
jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/impl/GenericKeyedObjectPoolFactory.java
 (original)
+++ 
jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/impl/GenericKeyedObjectPoolFactory.java
 Sat Apr  1 23:13:42 2006
@@ -36,7 +36,7 @@
     }
 
     public GenericKeyedObjectPoolFactory(KeyedPoolableObjectFactory factory, 
GenericKeyedObjectPool.Config config) {
-        
this(factory,config.maxActive,config.whenExhaustedAction,config.maxWait,config.maxIdle,config.testOnBorrow,config.testOnReturn,config.timeBetweenEvictionRunsMillis,config.numTestsPerEvictionRun,config.minEvictableIdleTimeMillis,config.testWhileIdle);
+        
this(factory,config.maxActive,config.whenExhaustedAction,config.maxWait,config.maxIdle,config.maxTotal,config.minIdle,config.testOnBorrow,config.testOnReturn,config.timeBetweenEvictionRunsMillis,config.numTestsPerEvictionRun,config.minEvictableIdleTimeMillis,config.testWhileIdle);
     }
 
     public GenericKeyedObjectPoolFactory(KeyedPoolableObjectFactory factory, 
int maxActive) {
@@ -68,7 +68,7 @@
     }
 
     public GenericKeyedObjectPoolFactory(KeyedPoolableObjectFactory factory, 
int maxActive, byte whenExhaustedAction, long maxWait, int maxIdle, int 
maxTotal, boolean testOnBorrow, boolean testOnReturn, long 
timeBetweenEvictionRunsMillis, int numTestsPerEvictionRun, long 
minEvictableIdleTimeMillis, boolean testWhileIdle) {
-        this(factory, maxActive, whenExhaustedAction, maxWait, maxIdle, 
GenericKeyedObjectPool.DEFAULT_MAX_TOTAL, 
GenericKeyedObjectPool.DEFAULT_MIN_IDLE , testOnBorrow, testOnReturn, 
timeBetweenEvictionRunsMillis, numTestsPerEvictionRun, 
minEvictableIdleTimeMillis, testWhileIdle);
+        this(factory, maxActive, whenExhaustedAction, maxWait, maxIdle, 
maxTotal, GenericKeyedObjectPool.DEFAULT_MIN_IDLE , testOnBorrow, testOnReturn, 
timeBetweenEvictionRunsMillis, numTestsPerEvictionRun, 
minEvictableIdleTimeMillis, testWhileIdle);
     }
 
     public GenericKeyedObjectPoolFactory(KeyedPoolableObjectFactory factory, 
int maxActive, byte whenExhaustedAction, long maxWait, int maxIdle, int 
maxTotal, int minIdle, boolean testOnBorrow, boolean testOnReturn, long 
timeBetweenEvictionRunsMillis, int numTestsPerEvictionRun, long 
minEvictableIdleTimeMillis, boolean testWhileIdle) {



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to