Return-Path: 
 <commits-return-38076-apmail-commons-commits-archive=commons.apache.org@commons.apache.org>
X-Original-To: apmail-commons-commits-archive@minotaur.apache.org
Delivered-To: apmail-commons-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 8B8401070F
	for <apmail-commons-commits-archive@minotaur.apache.org>;
 Tue,  3 Dec 2013 22:45:04 +0000 (UTC)
Received: (qmail 16984 invoked by uid 500); 3 Dec 2013 22:45:04 -0000
Delivered-To: apmail-commons-commits-archive@commons.apache.org
Received: (qmail 16928 invoked by uid 500); 3 Dec 2013 22:45:04 -0000
Mailing-List: contact commits-help@commons.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@commons.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@commons.apache.org>
List-Post: <mailto:commits@commons.apache.org>
List-Id: <commits.commons.apache.org>
Reply-To: dev@commons.apache.org
Delivered-To: mailing list commits@commons.apache.org
Received: (qmail 16921 invoked by uid 99); 3 Dec 2013 22:45:04 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 Dec 2013 22:45:04 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 Dec 2013 22:45:01 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 94C2423889E0;
	Tue,  3 Dec 2013 22:44:39 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1547625 - in
 /commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2:
 DelegatingConnection.java PoolableConnection.java
 PoolablePreparedStatement.java PoolingConnection.java
 PoolingDataSource.java managed/ManagedConnection.java
Date: Tue, 03 Dec 2013 22:44:39 -0000
To: commits@commons.apache.org
From: markt@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20131203224439.94C2423889E0@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: markt
Date: Tue Dec  3 22:44:38 2013
New Revision: 1547625

URL: http://svn.apache.org/r1547625
Log:
More work to address generics warnings

Modified:
    commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DelegatingConnection.java
    commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolableConnection.java
    commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolablePreparedStatement.java
    commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolingConnection.java
    commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolingDataSource.java
    commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/ManagedConnection.java

Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DelegatingConnection.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DelegatingConnection.java?rev=1547625&r1=1547624&r2=1547625&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DelegatingConnection.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DelegatingConnection.java Tue Dec  3 22:44:38 2013
@@ -138,7 +138,7 @@ public class DelegatingConnection<C exte
      * Returns my underlying {@link Connection}.
      * @return my underlying {@link Connection}.
      */
-    public Connection getDelegate() {
+    public C getDelegate() {
         return getDelegateInternal();
     }
 

Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolableConnection.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolableConnection.java?rev=1547625&r1=1547624&r2=1547625&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolableConnection.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolableConnection.java Tue Dec  3 22:44:38 2013
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -31,7 +31,7 @@ import org.apache.commons.pool2.ObjectPo
  * @author James House
  * @version $Revision$ $Date$
  */
-public class PoolableConnection extends DelegatingConnection {
+public class PoolableConnection extends DelegatingConnection<Connection> {
     /** The pool to which I should return. */
     // TODO: Correct use of the pool requires that this connection is only every returned to the pool once.
     protected ObjectPool<PoolableConnection> _pool = null;

Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolablePreparedStatement.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolablePreparedStatement.java?rev=1547625&r1=1547624&r2=1547625&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolablePreparedStatement.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolablePreparedStatement.java Tue Dec  3 22:44:38 2013
@@ -61,7 +61,7 @@ public class PoolablePreparedStatement<K
      */
     public PoolablePreparedStatement(PreparedStatement stmt, K key,
             KeyedObjectPool<K, PoolablePreparedStatement<K,S>> pool,
-            DelegatingConnection conn) {
+            DelegatingConnection<?> conn) {
         super(conn, stmt);
         _pool = pool;
         _key = key;

Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolingConnection.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolingConnection.java?rev=1547625&r1=1547624&r2=1547625&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolingConnection.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolingConnection.java Tue Dec  3 22:44:38 2013
@@ -45,7 +45,7 @@ import org.apache.commons.pool2.impl.Def
  * @author Dirk Verbeeck
  * @version $Revision$ $Date$
  */
-public class PoolingConnection extends DelegatingConnection
+public class PoolingConnection extends DelegatingConnection<Connection>
         implements KeyedPooledObjectFactory<PStmtKey,DelegatingPreparedStatement> {
 
     /** Pool of {@link PreparedStatement}s. and {@link CallableStatement}s */

Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolingDataSource.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolingDataSource.java?rev=1547625&r1=1547624&r2=1547625&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolingDataSource.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolingDataSource.java Tue Dec  3 22:44:38 2013
@@ -108,11 +108,11 @@ public class PoolingDataSource<C extends
     @Override
     public Connection getConnection() throws SQLException {
         try {
-            Connection conn = _pool.borrowObject();
-            if (conn != null) {
-                conn = new PoolGuardConnectionWrapper(conn);
+            C conn = _pool.borrowObject();
+            if (conn == null) {
+                return null;
             }
-            return conn;
+            return  new PoolGuardConnectionWrapper<>(conn);
         } catch(SQLException e) {
             throw e;
         } catch(NoSuchElementException e) {
@@ -181,9 +181,10 @@ public class PoolingDataSource<C extends
      * PoolGuardConnectionWrapper is a Connection wrapper that makes sure a
      * closed connection cannot be used anymore.
      */
-    private class PoolGuardConnectionWrapper extends DelegatingConnection {
+    private class PoolGuardConnectionWrapper<D extends Connection>
+            extends DelegatingConnection<D> {
 
-        PoolGuardConnectionWrapper(Connection delegate) {
+        PoolGuardConnectionWrapper(D delegate) {
             super(delegate);
         }
 
@@ -191,7 +192,7 @@ public class PoolingDataSource<C extends
          * @see org.apache.commons.dbcp2.DelegatingConnection#getDelegate()
          */
         @Override
-        public Connection getDelegate() {
+        public D getDelegate() {
             if (isAccessToUnderlyingConnectionAllowed()) {
                 return super.getDelegate();
             } else {

Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/ManagedConnection.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/ManagedConnection.java?rev=1547625&r1=1547624&r2=1547625&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/ManagedConnection.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/ManagedConnection.java Tue Dec  3 22:44:38 2013
@@ -255,7 +255,7 @@ public class ManagedConnection<C extends
     }
 
     @Override
-    public Connection getDelegate() {
+    public C getDelegate() {
         if (isAccessToUnderlyingConnectionAllowed()) {
             return getDelegateInternal();
         } else {