Return-Path: 
 <commits-return-38072-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 47F9110674
	for <apmail-commons-commits-archive@minotaur.apache.org>;
 Tue,  3 Dec 2013 22:26:23 +0000 (UTC)
Received: (qmail 90577 invoked by uid 500); 3 Dec 2013 22:26:23 -0000
Delivered-To: apmail-commons-commits-archive@commons.apache.org
Received: (qmail 90461 invoked by uid 500); 3 Dec 2013 22:26:23 -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 90454 invoked by uid 99); 3 Dec 2013 22:26:23 -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:26:23 +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:26:20 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id E0F2323888FE;
	Tue,  3 Dec 2013 22:25:58 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1547615 - in
 /commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2:
 DelegatingConnection.java managed/ManagedConnection.java
Date: Tue, 03 Dec 2013 22:25:58 -0000
To: commits@commons.apache.org
From: markt@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20131203222558.E0F2323888FE@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: markt
Date: Tue Dec  3 22:25:58 2013
New Revision: 1547615

URL: http://svn.apache.org/r1547615
Log:
Fix the generics warnings in ManagedConnection

Modified:
    commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DelegatingConnection.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=1547615&r1=1547614&r2=1547615&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:25:58 2013
@@ -142,7 +142,7 @@ public class DelegatingConnection<C exte
         return getDelegateInternal();
     }
 
-    protected final Connection getDelegateInternal() {
+    protected final C getDelegateInternal() {
         return _conn;
     }
 

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=1547615&r1=1547614&r2=1547615&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:25:58 2013
@@ -40,14 +40,14 @@ import java.sql.SQLException;
  * @author Dain Sundstrom
  * @version $Revision$
  */
-public class ManagedConnection<C extends Connection> extends DelegatingConnection {
-    private final ObjectPool<Connection> pool;
+public class ManagedConnection<C extends Connection> extends DelegatingConnection<C> {
+    private final ObjectPool<C> pool;
     private final TransactionRegistry transactionRegistry;
     private final boolean accessToUnderlyingConnectionAllowed;
     private TransactionContext transactionContext;
     private boolean isSharedConnection;
 
-    public ManagedConnection(ObjectPool<Connection> pool,
+    public ManagedConnection(ObjectPool<C> pool,
             TransactionRegistry transactionRegistry,
             boolean accessToUnderlyingConnectionAllowed) throws SQLException {
         super(null);
@@ -88,7 +88,7 @@ public class ManagedConnection<C extends
             // in the transaction, replace our delegate with the enrolled connection
 
             // return current connection to the pool
-            Connection connection = getDelegateInternal();
+            C connection = getDelegateInternal();
             setDelegate(null);
             if (connection != null) {
                 try {
@@ -106,8 +106,12 @@ public class ManagedConnection<C extends
             // add a listener to the transaction context
             transactionContext.addTransactionContextListener(new CompletionListener());
 
-            // set our delegate to the shared connection
-            setDelegate(transactionContext.getSharedConnection());
+            // Set our delegate to the shared connection. Note that this will
+            // always be of type C since it has been shared by another
+            // connection from the same pool.
+            @SuppressWarnings("unchecked")
+            C shared = (C) transactionContext.getSharedConnection();
+            setDelegate(shared);
 
             // remember that we are using a shared connection so it can be cleared after the
             // transaction completes
@@ -117,7 +121,7 @@ public class ManagedConnection<C extends
             if (getDelegateInternal() == null) {
                 try {
                     // borrow a new connection from the pool
-                    Connection connection = pool.borrowObject();
+                    C connection = pool.borrowObject();
                     setDelegate(connection);
                 } catch (Exception e) {
                     throw (SQLException) new SQLException("Unable to acquire a new connection from the pool").initCause(e);