Author: markt
Date: Mon Jun 18 21:06:35 2018
New Revision: 1833769
URL: http://svn.apache.org/viewvc?rev=1833769&view=rev
Log:
Fix IDE warnings after Pool updates
Modified:
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolableConnectionFactory.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/DriverAdapterCPDS.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/SharedPoolDataSource.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/managed/PoolableManagedConnectionFactory.java
Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java?rev=1833769&r1=1833768&r2=1833769&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java Mon Jun
18 21:06:35 2018
@@ -2225,7 +2225,7 @@ public class BasicDataSource implements
*/
protected void createConnectionPool(final PoolableConnectionFactory
factory) {
// Create an object pool to contain our active connections
- final GenericObjectPoolConfig config = new GenericObjectPoolConfig();
+ final GenericObjectPoolConfig<PoolableConnection> config = new
GenericObjectPoolConfig<>();
updateJmxName(config);
config.setJmxEnabled(registeredJmxName != null); // Disable JMX on
the underlying pool if the DS is not registered.
final GenericObjectPool<PoolableConnection> gop =
createObjectPool(factory, config, abandonedConfig);
@@ -2256,7 +2256,7 @@ public class BasicDataSource implements
* @return a non-null instance
*/
protected GenericObjectPool<PoolableConnection> createObjectPool(
- final PoolableConnectionFactory factory, final
GenericObjectPoolConfig poolConfig,
+ final PoolableConnectionFactory factory, final
GenericObjectPoolConfig<PoolableConnection> poolConfig,
final AbandonedConfig abandonedConfig) {
GenericObjectPool<PoolableConnection> gop;
if (abandonedConfig != null &&
@@ -2433,7 +2433,7 @@ public class BasicDataSource implements
// NO-OP
}
- private void updateJmxName(final GenericObjectPoolConfig config) {
+ private void updateJmxName(final
GenericObjectPoolConfig<PoolableConnection> config) {
if (registeredJmxName == null) {
return;
}
Modified:
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolableConnectionFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolableConnectionFactory.java?rev=1833769&r1=1833768&r2=1833769&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolableConnectionFactory.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolableConnectionFactory.java
Mon Jun 18 21:06:35 2018
@@ -280,7 +280,7 @@ public class PoolableConnectionFactory
if(poolStatements) {
conn = new PoolingConnection(conn);
- final GenericKeyedObjectPoolConfig config = new
GenericKeyedObjectPoolConfig();
+ final GenericKeyedObjectPoolConfig<DelegatingPreparedStatement>
config = new GenericKeyedObjectPoolConfig<>();
config.setMaxTotalPerKey(-1);
config.setBlockWhenExhausted(false);
config.setMaxWaitMillis(0);
Modified:
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/DriverAdapterCPDS.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/DriverAdapterCPDS.java?rev=1833769&r1=1833768&r2=1833769&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/DriverAdapterCPDS.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/DriverAdapterCPDS.java
Mon Jun 18 21:06:35 2018
@@ -194,7 +194,7 @@ public class DriverAdapterCPDS
}
KeyedObjectPool<PStmtKeyCPDS, PoolablePreparedStatement<PStmtKeyCPDS>>
stmtPool = null;
if (isPoolPreparedStatements()) {
- final GenericKeyedObjectPoolConfig config = new
GenericKeyedObjectPoolConfig();
+ final
GenericKeyedObjectPoolConfig<PoolablePreparedStatement<PStmtKeyCPDS>> config =
new GenericKeyedObjectPoolConfig<>();
config.setMaxTotalPerKey(Integer.MAX_VALUE);
config.setBlockWhenExhausted(false);
config.setMaxWaitMillis(0);
Modified:
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/SharedPoolDataSource.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/SharedPoolDataSource.java?rev=1833769&r1=1833768&r2=1833769&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/SharedPoolDataSource.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/SharedPoolDataSource.java
Mon Jun 18 21:06:35 2018
@@ -173,8 +173,8 @@ public class SharedPoolDataSource extend
getValidationQueryTimeout(), isRollbackAfterValidation());
factory.setMaxConnLifetimeMillis(getMaxConnLifetimeMillis());
- final GenericKeyedObjectPoolConfig config =
- new GenericKeyedObjectPoolConfig();
+ final GenericKeyedObjectPoolConfig<PooledConnectionAndInfo> config =
+ new GenericKeyedObjectPoolConfig<>();
config.setBlockWhenExhausted(getDefaultBlockWhenExhausted());
config.setEvictionPolicyClassName(getDefaultEvictionPolicyClassName());
config.setLifo(getDefaultLifo());
Modified:
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/managed/PoolableManagedConnectionFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/managed/PoolableManagedConnectionFactory.java?rev=1833769&r1=1833768&r2=1833769&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/managed/PoolableManagedConnectionFactory.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/managed/PoolableManagedConnectionFactory.java
Mon Jun 18 21:06:35 2018
@@ -71,7 +71,7 @@ public class PoolableManagedConnectionFa
initializeConnection(conn);
if (getPoolStatements()) {
conn = new PoolingConnection(conn);
- final GenericKeyedObjectPoolConfig config = new
GenericKeyedObjectPoolConfig();
+ final GenericKeyedObjectPoolConfig<DelegatingPreparedStatement>
config = new GenericKeyedObjectPoolConfig<>();
config.setMaxTotalPerKey(-1);
config.setBlockWhenExhausted(false);
config.setMaxWaitMillis(0);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
