Return-Path: Delivered-To: apmail-commons-commits-archive@minotaur.apache.org Received: (qmail 92181 invoked from network); 10 Nov 2009 23:02:19 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 10 Nov 2009 23:02:19 -0000 Received: (qmail 41209 invoked by uid 500); 10 Nov 2009 23:02:19 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 41129 invoked by uid 500); 10 Nov 2009 23:02:19 -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 41120 invoked by uid 99); 10 Nov 2009 23:02:19 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 10 Nov 2009 23:02:19 +0000 X-ASF-Spam-Status: No, hits=-2.7 required=5.0 tests=AWL,BAYES_00 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, 10 Nov 2009 23:02:16 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id D632223888D4; Tue, 10 Nov 2009 23:01:56 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r834702 - in /commons/proper/dbcp/trunk: src/java/org/apache/commons/dbcp/cpdsadapter/PooledConnectionImpl.java xdocs/changes.xml Date: Tue, 10 Nov 2009 23:01:56 -0000 To: commits@commons.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091110230156.D632223888D4@eris.apache.org> Author: markt Date: Tue Nov 10 23:01:56 2009 New Revision: 834702 URL: http://svn.apache.org/viewvc?rev=834702&view=rev Log: Fix DBCP-303. Patch provided by Dave Oxley. Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/cpdsadapter/PooledConnectionImpl.java commons/proper/dbcp/trunk/xdocs/changes.xml Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/cpdsadapter/PooledConnectionImpl.java URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/cpdsadapter/PooledConnectionImpl.java?rev=834702&r1=834701&r2=834702&view=diff ============================================================================== --- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/cpdsadapter/PooledConnectionImpl.java (original) +++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/cpdsadapter/PooledConnectionImpl.java Tue Nov 10 23:01:56 2009 @@ -410,9 +410,16 @@ PStmtKey key = (PStmtKey)obj; if (null == key._resultSetType && null == key._resultSetConcurrency) { - return new PoolablePreparedStatementStub( - connection.prepareStatement(key._sql), - key, pstmtPool, delegatingConnection); + if (null == key._autoGeneratedKeys) { + return new PoolablePreparedStatementStub( + connection.prepareStatement(key._sql), + key, pstmtPool, delegatingConnection); + } else { + return new PoolablePreparedStatementStub( + connection.prepareStatement(key._sql, + key._autoGeneratedKeys.intValue()), + key, pstmtPool, delegatingConnection); + } } else { return new PoolablePreparedStatementStub( connection.prepareStatement(key._sql, Modified: commons/proper/dbcp/trunk/xdocs/changes.xml URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/xdocs/changes.xml?rev=834702&r1=834701&r2=834702&view=diff ============================================================================== --- commons/proper/dbcp/trunk/xdocs/changes.xml (original) +++ commons/proper/dbcp/trunk/xdocs/changes.xml Tue Nov 10 23:01:56 2009 @@ -42,6 +42,10 @@ new features as well as bug fixes and instrumentation. Some bug fixes will change semantics (e.g. connection close will become idempotent). The minimum JDK level will be increased to 1.4"> + + Ensure Statement.getGeneratedKeys() works correctly with the CPDS + adapter. + Removed incorrectly advertised ClassNotFoundException from JOCLContentHandler.ConstructorDetails.createObject().