Author: markt
Date: Wed Aug 17 12:37:26 2011
New Revision: 1158659
URL: http://svn.apache.org/viewvc?rev=1158659&view=rev
Log:
Update DBCP 2 after changes in pool 2
Modified:
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/PerUserPoolDataSource.java
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/SharedPoolDataSource.java
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/PoolableManagedConnectionFactory.java
commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestAbandonedObjectPool.java
Modified:
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java
URL:
http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java?rev=1158659&r1=1158658&r2=1158659&view=diff
==============================================================================
---
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java
(original)
+++
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java
Wed Aug 17 12:37:26 2011
@@ -27,7 +27,6 @@ import org.apache.commons.pool2.Poolable
import org.apache.commons.pool2.ObjectPool;
import org.apache.commons.pool2.impl.GenericKeyedObjectPool;
import org.apache.commons.pool2.impl.GenericKeyedObjectPoolConfig;
-import org.apache.commons.pool2.impl.WhenExhaustedAction;
/**
* A {@link PoolableObjectFactory} that creates
@@ -187,7 +186,7 @@ public class PoolableConnectionFactory
GenericKeyedObjectPoolConfig<PStmtKey,DelegatingPreparedStatement>
config =
new
GenericKeyedObjectPoolConfig<PStmtKey,DelegatingPreparedStatement>();
config.setMaxTotalPerKey(-1);
- config.setWhenExhaustedAction(WhenExhaustedAction.FAIL);
+ config.setBlockWhenExhausted(false);
config.setMaxWait(0);
config.setMaxIdlePerKey(1);
config.setMaxTotal(maxOpenPreparedStatements);
Modified:
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java
URL:
http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java?rev=1158659&r1=1158658&r2=1158659&view=diff
==============================================================================
---
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java
(original)
+++
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java
Wed Aug 17 12:37:26 2011
@@ -38,7 +38,6 @@ import org.apache.commons.dbcp2.Poolable
import org.apache.commons.pool2.KeyedObjectPool;
import org.apache.commons.pool2.impl.GenericKeyedObjectPool;
import org.apache.commons.pool2.impl.GenericKeyedObjectPoolConfig;
-import org.apache.commons.pool2.impl.WhenExhaustedAction;
/**
* <p>
@@ -195,7 +194,7 @@ public class DriverAdapterCPDS
GenericKeyedObjectPoolConfig<PStmtKeyCPDS,PoolablePreparedStatement<PStmtKeyCPDS,PoolablePreparedStatementStub>>
config =
new
GenericKeyedObjectPoolConfig<PStmtKeyCPDS,PoolablePreparedStatement<PStmtKeyCPDS,PoolablePreparedStatementStub>>();
config.setMaxTotalPerKey(Integer.MAX_VALUE);
- config.setWhenExhaustedAction(WhenExhaustedAction.FAIL);
+ config.setBlockWhenExhausted(false);
config.setMaxWait(0);
config.setMaxIdlePerKey(getMaxIdle());
if (getMaxPreparedStatements() <= 0)
Modified:
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/PerUserPoolDataSource.java
URL:
http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/PerUserPoolDataSource.java?rev=1158659&r1=1158658&r2=1158659&view=diff
==============================================================================
---
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/PerUserPoolDataSource.java
(original)
+++
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/PerUserPoolDataSource.java
Wed Aug 17 12:37:26 2011
@@ -33,7 +33,6 @@ import javax.sql.ConnectionPoolDataSourc
import org.apache.commons.pool2.ObjectPool;
import org.apache.commons.pool2.impl.GenericObjectPool;
import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
-import org.apache.commons.pool2.impl.WhenExhaustedAction;
/**
* <p>A pooling <code>DataSource</code> appropriate for deployment within
@@ -529,11 +528,11 @@ public class PerUserPoolDataSource
pool.setMaxIdle(maxIdle);
pool.setMaxWait(maxWait);
if (maxTotal <= 0) {
- pool.setWhenExhaustedAction(WhenExhaustedAction.FAIL);
+ pool.setBlockWhenExhausted(false);
pool.setMaxTotal(Integer.MAX_VALUE);
}
if (maxWait == 0) {
- pool.setWhenExhaustedAction(WhenExhaustedAction.FAIL);
+ pool.setBlockWhenExhausted(false);
}
pool.setTestOnBorrow(getTestOnBorrow());
Modified:
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/SharedPoolDataSource.java
URL:
http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/SharedPoolDataSource.java?rev=1158659&r1=1158658&r2=1158659&view=diff
==============================================================================
---
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/SharedPoolDataSource.java
(original)
+++
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/SharedPoolDataSource.java
Wed Aug 17 12:37:26 2011
@@ -30,7 +30,6 @@ import javax.sql.ConnectionPoolDataSourc
import org.apache.commons.pool2.KeyedObjectPool;
import org.apache.commons.pool2.impl.GenericKeyedObjectPool;
import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
-import org.apache.commons.pool2.impl.WhenExhaustedAction;
/**
* <p>A pooling <code>DataSource</code> appropriate for deployment within
@@ -222,13 +221,13 @@ public class SharedPoolDataSource
tmpPool.setMaxTotalPerKey(getMaxTotal());
tmpPool.setMaxIdlePerKey(getMaxIdle());
tmpPool.setMaxWait(getMaxWait());
- tmpPool.setWhenExhaustedAction(WhenExhaustedAction.BLOCK);
+ tmpPool.setBlockWhenExhausted(true);
if (maxTotal <= 0) {
- tmpPool.setWhenExhaustedAction(WhenExhaustedAction.FAIL);
+ tmpPool.setBlockWhenExhausted(false);
tmpPool.setMaxTotalPerKey(Integer.MAX_VALUE);
}
if (maxWait == 0) {
- tmpPool.setWhenExhaustedAction(WhenExhaustedAction.FAIL);
+ tmpPool.setBlockWhenExhausted(false);
}
tmpPool.setTestOnBorrow(getTestOnBorrow());
tmpPool.setTestOnReturn(getTestOnReturn());
Modified:
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/PoolableManagedConnectionFactory.java
URL:
http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/PoolableManagedConnectionFactory.java?rev=1158659&r1=1158658&r2=1158659&view=diff
==============================================================================
---
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/PoolableManagedConnectionFactory.java
(original)
+++
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/PoolableManagedConnectionFactory.java
Wed Aug 17 12:37:26 2011
@@ -26,7 +26,6 @@ import org.apache.commons.dbcp2.PoolingC
import org.apache.commons.pool2.KeyedObjectPool;
import org.apache.commons.pool2.impl.GenericKeyedObjectPool;
import org.apache.commons.pool2.impl.GenericKeyedObjectPoolConfig;
-import org.apache.commons.pool2.impl.WhenExhaustedAction;
/**
* A {@link PoolableConnectionFactory} that creates {@link
PoolableManagedConnection}s.
@@ -67,7 +66,7 @@ public class PoolableManagedConnectionFa
GenericKeyedObjectPoolConfig<PStmtKey,DelegatingPreparedStatement>
config =
new
GenericKeyedObjectPoolConfig<PStmtKey,DelegatingPreparedStatement>();
config.setMaxTotalPerKey(-1);
- config.setWhenExhaustedAction(WhenExhaustedAction.FAIL);
+ config.setBlockWhenExhausted(false);
config.setMaxWait(0);
config.setMaxIdlePerKey(1);
config.setMaxTotal(maxOpenPreparedStatements);
Modified:
commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestAbandonedObjectPool.java
URL:
http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestAbandonedObjectPool.java?rev=1158659&r1=1158658&r2=1158659&view=diff
==============================================================================
---
commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestAbandonedObjectPool.java
(original)
+++
commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestAbandonedObjectPool.java
Wed Aug 17 12:37:26 2011
@@ -25,7 +25,6 @@ import junit.framework.TestCase;
import junit.framework.TestSuite;
import org.apache.commons.pool2.PoolableObjectFactory;
-import org.apache.commons.pool2.impl.WhenExhaustedAction;
/**
* TestCase for AbandonedObjectPool
@@ -74,7 +73,7 @@ public class TestAbandonedObjectPool ext
final int POOL_SIZE = 30;
pool.setMaxTotal(POOL_SIZE);
pool.setMaxIdle(POOL_SIZE);
- pool.setWhenExhaustedAction(WhenExhaustedAction.FAIL);
+ pool.setBlockWhenExhausted(false);
// Exhaust the connection pool
Vector vec = new Vector();
