You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@commons.apache.org by ma...@apache.org on 2013/12/03 23:29:39 UTC

svn commit: r1547618 - /commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/BasicManagedDataSource.java

Author: markt
Date: Tue Dec  3 22:29:38 2013
New Revision: 1547618

URL: http://svn.apache.org/r1547618
Log:
Fix the generics warnings in BasicManagedDataSource

Modified:
    commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/BasicManagedDataSource.java

Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/BasicManagedDataSource.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/BasicManagedDataSource.java?rev=1547618&r1=1547617&r2=1547618&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/BasicManagedDataSource.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/BasicManagedDataSource.java Tue Dec  3 22:29:38 2013
@@ -19,6 +19,7 @@ package org.apache.commons.dbcp2.managed
 
 import org.apache.commons.dbcp2.BasicDataSource;
 import org.apache.commons.dbcp2.ConnectionFactory;
+import org.apache.commons.dbcp2.PoolableConnection;
 import org.apache.commons.dbcp2.PoolableConnectionFactory;
 import org.apache.commons.dbcp2.PoolingDataSource;
 
@@ -163,7 +164,8 @@ public class BasicManagedDataSource exte
 
     @Override
     protected void createDataSourceInstance() throws SQLException {
-        PoolingDataSource pds = new ManagedDataSource(connectionPool, transactionRegistry);
+        PoolingDataSource<PoolableConnection> pds =
+                new ManagedDataSource<>(connectionPool, transactionRegistry);
         pds.setAccessToUnderlyingConnectionAllowed(isAccessToUnderlyingConnectionAllowed());
         pds.setLogWriter(logWriter);
         dataSource = pds;