Return-Path: 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 907696527 for ; Thu, 4 Aug 2011 08:38:44 +0000 (UTC) Received: (qmail 65952 invoked by uid 500); 4 Aug 2011 08:38:39 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 65600 invoked by uid 500); 4 Aug 2011 08:38:22 -0000 Mailing-List: contact commits-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list commits@commons.apache.org Received: (qmail 65587 invoked by uid 99); 4 Aug 2011 08:38:19 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 04 Aug 2011 08:38:19 +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; Thu, 04 Aug 2011 08:38:18 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id DF69F238890D for ; Thu, 4 Aug 2011 08:37:57 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1153782 - in /commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2: PoolablePreparedStatement.java cpdsadapter/PoolablePreparedStatementStub.java cpdsadapter/PooledConnectionImpl.java Date: Thu, 04 Aug 2011 08:37:57 -0000 To: commits@commons.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110804083757.DF69F238890D@eris.apache.org> Author: markt Date: Thu Aug 4 08:37:57 2011 New Revision: 1153782 URL: http://svn.apache.org/viewvc?rev=1153782&view=rev Log: Generics Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolablePreparedStatement.java commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/cpdsadapter/PoolablePreparedStatementStub.java commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java 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=1153782&r1=1153781&r2=1153782&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 Thu Aug 4 08:37:57 2011 @@ -42,7 +42,7 @@ public class PoolablePreparedStatement e /** * The {@link KeyedObjectPool} from which I was obtained. */ - protected KeyedObjectPool _pool = null; + protected KeyedObjectPool _pool = null; /** * My "key" as used by {@link KeyedObjectPool}. @@ -59,7 +59,8 @@ public class PoolablePreparedStatement e * @param conn the {@link Connection} from which I was created */ public PoolablePreparedStatement(PreparedStatement stmt, PStmtKey key, - KeyedObjectPool pool, Connection conn) { + KeyedObjectPool pool, + Connection conn) { super((DelegatingConnection) conn, stmt); _pool = pool; _key = key; Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/cpdsadapter/PoolablePreparedStatementStub.java URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/cpdsadapter/PoolablePreparedStatementStub.java?rev=1153782&r1=1153781&r2=1153782&view=diff ============================================================================== --- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/cpdsadapter/PoolablePreparedStatementStub.java (original) +++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/cpdsadapter/PoolablePreparedStatementStub.java Thu Aug 4 08:37:57 2011 @@ -21,6 +21,8 @@ import java.sql.PreparedStatement; import java.sql.Connection; import java.sql.SQLException; import org.apache.commons.pool2.KeyedObjectPool; +import org.apache.commons.dbcp2.DelegatingPreparedStatement; +import org.apache.commons.dbcp2.PStmtKey; import org.apache.commons.dbcp2.PoolablePreparedStatement; /** @@ -41,7 +43,9 @@ class PoolablePreparedStatementStub exte * @param conn the {@link Connection} from which I was created */ public PoolablePreparedStatementStub(PreparedStatement stmt, - PStmtKeyCPDS key, KeyedObjectPool pool, Connection conn) { + PStmtKey key, + KeyedObjectPool pool, + Connection conn) { super(stmt, key, pool, conn); } Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java?rev=1153782&r1=1153781&r2=1153782&view=diff ============================================================================== --- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java (original) +++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java Thu Aug 4 08:37:57 2011 @@ -30,6 +30,8 @@ import javax.sql.StatementEventListener; /* JDBC_4_ANT_KEY_END */ import org.apache.commons.dbcp2.DelegatingConnection; +import org.apache.commons.dbcp2.DelegatingPreparedStatement; +import org.apache.commons.dbcp2.PStmtKey; import org.apache.commons.pool2.KeyedObjectPool; import org.apache.commons.pool2.KeyedPoolableObjectFactory; @@ -79,7 +81,7 @@ class PooledConnectionImpl implements Po /** My pool of {*link PreparedStatement}s. */ // TODO - make final? - protected KeyedObjectPool pstmtPool = null; + protected KeyedObjectPool pstmtPool = null; /** * Controls access to the underlying connection @@ -103,7 +105,7 @@ class PooledConnectionImpl implements Po } public void setStatementPool( - KeyedObjectPool statementPool) { + KeyedObjectPool statementPool) { pstmtPool = statementPool; }