Author: psteitz
Date: Fri Apr 16 22:07:42 2021
New Revision: 1888836
URL: http://svn.apache.org/viewvc?rev=1888836&view=rev
Log:
Generics.
Modified:
commons/sandbox/performance/trunk/src/java/org/apache/commons/performance/dbcp/DBCPSoak.java
Modified:
commons/sandbox/performance/trunk/src/java/org/apache/commons/performance/dbcp/DBCPSoak.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/performance/trunk/src/java/org/apache/commons/performance/dbcp/DBCPSoak.java?rev=1888836&r1=1888835&r2=1888836&view=diff
==============================================================================
---
commons/sandbox/performance/trunk/src/java/org/apache/commons/performance/dbcp/DBCPSoak.java
(original)
+++
commons/sandbox/performance/trunk/src/java/org/apache/commons/performance/dbcp/DBCPSoak.java
Fri Apr 16 22:07:42 2021
@@ -28,6 +28,7 @@ import org.apache.commons.dbcp2.BasicDat
import org.apache.commons.dbcp2.ConnectionFactory;
import org.apache.commons.dbcp2.DriverConnectionFactory;
import org.apache.commons.dbcp2.DriverManagerConnectionFactory;
+import org.apache.commons.dbcp2.PoolableConnection;
import org.apache.commons.dbcp2.PoolableConnectionFactory;
import org.apache.commons.dbcp2.PoolingDataSource;
import org.apache.commons.performance.ClientThread;
@@ -106,7 +107,7 @@ public class DBCPSoak
private String dataSourceType;
// Instance variables
- private GenericObjectPool connectionPool;
+ private GenericObjectPool<PoolableConnection> connectionPool;
private DataSource dataSource;
@@ -220,7 +221,7 @@ public class DBCPSoak
}
// Create object pool
- connectionPool = new GenericObjectPool(poolableConnectionFactory);
+ connectionPool = new
GenericObjectPool<PoolableConnection>(poolableConnectionFactory);
connectionPool.setMaxTotal(maxActive);
connectionPool.setMaxWaitMillis(maxWait);
connectionPool.setMaxIdle(maxIdle);
@@ -234,7 +235,7 @@ public class DBCPSoak
connectionPool.setTestOnReturn(testOnReturn);
// Create DataSource
- dataSource = new PoolingDataSource(connectionPool);
+ dataSource = new PoolingDataSource<PoolableConnection>(connectionPool);
checkDatabase();
}