Return-Path: Delivered-To: apmail-commons-commits-archive@minotaur.apache.org Received: (qmail 81752 invoked from network); 13 Nov 2009 19:19:45 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 13 Nov 2009 19:19:45 -0000 Received: (qmail 33347 invoked by uid 500); 13 Nov 2009 19:19:44 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 33266 invoked by uid 500); 13 Nov 2009 19:19:44 -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 33257 invoked by uid 99); 13 Nov 2009 19:19:44 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 13 Nov 2009 19:19:44 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Fri, 13 Nov 2009 19:19:41 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 91872238898A; Fri, 13 Nov 2009 19:19:20 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r835956 - in /commons/proper/dbcp/trunk/src: java/org/apache/commons/dbcp/DelegatingConnection.java java/org/apache/commons/dbcp/managed/BasicManagedDataSource.java test/org/apache/commons/dbcp/TestDelegatingDatabaseMetaData.java Date: Fri, 13 Nov 2009 19:19:20 -0000 To: commits@commons.apache.org From: psteitz@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091113191920.91872238898A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: psteitz Date: Fri Nov 13 19:19:19 2009 New Revision: 835956 URL: http://svn.apache.org/viewvc?rev=835956&view=rev Log: Adjusted source flags to support full build on JDK 1.5. Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/DelegatingConnection.java commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/managed/BasicManagedDataSource.java commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/TestDelegatingDatabaseMetaData.java Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/DelegatingConnection.java URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/DelegatingConnection.java?rev=835956&r1=835955&r2=835956&view=diff ============================================================================== --- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/DelegatingConnection.java (original) +++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/DelegatingConnection.java Fri Nov 13 19:19:19 2009 @@ -27,13 +27,13 @@ import java.util.Iterator; import java.util.List; import java.util.Map; +import java.sql.ResultSet; /* JDBC_4_ANT_KEY_BEGIN */ import java.sql.Array; import java.sql.Blob; import java.sql.ClientInfoStatus; import java.sql.Clob; import java.sql.NClob; -import java.sql.ResultSet; import java.sql.SQLClientInfoException; import java.sql.SQLXML; import java.sql.Struct; Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/managed/BasicManagedDataSource.java URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/managed/BasicManagedDataSource.java?rev=835956&r1=835955&r2=835956&view=diff ============================================================================== --- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/managed/BasicManagedDataSource.java (original) +++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/managed/BasicManagedDataSource.java Fri Nov 13 19:19:19 2009 @@ -147,7 +147,11 @@ String message = "Cannot load XA data source class '" + xaDataSource + "'"; logWriter.println(message); t.printStackTrace(logWriter); - throw new SQLException(message, t); + throw new SQLException(message + /* JDBC_4_ANT_KEY_BEGIN */ + , t + /* JDBC_4_ANT_KEY_END */ + ); } try { @@ -156,7 +160,11 @@ String message = "Cannot create XA data source of class '" + xaDataSource + "'"; logWriter.println(message); t.printStackTrace(logWriter); - throw new SQLException(message, t); + throw new SQLException(message + /* JDBC_4_ANT_KEY_BEGIN */ + , t + /* JDBC_4_ANT_KEY_END */ + ); } } @@ -200,7 +208,11 @@ } catch (RuntimeException e) { throw e; } catch (Exception e) { - throw new SQLException("Cannot create PoolableConnectionFactory (" + e.getMessage() + ")", e); + throw new SQLException("Cannot create PoolableConnectionFactory (" + e.getMessage() + ")" + /* JDBC_4_ANT_KEY_BEGIN */ + , e + /* JDBC_4_ANT_KEY_END */ + ); } } } Modified: commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/TestDelegatingDatabaseMetaData.java URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/TestDelegatingDatabaseMetaData.java?rev=835956&r1=835955&r2=835956&view=diff ============================================================================== --- commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/TestDelegatingDatabaseMetaData.java (original) +++ commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/TestDelegatingDatabaseMetaData.java Fri Nov 13 19:19:19 2009 @@ -85,10 +85,12 @@ assertTrue(!meta.equals(meta3)); } + /* JDBC_4_ANT_KEY_BEGIN */ public void testCheckOpen() throws Exception { ResultSet rst = meta.getSchemas(); assertTrue(!rst.isClosed()); conn.close(); assertTrue(rst.isClosed()); } + /* JDBC_4_ANT_KEY_END */ }