commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pste...@apache.org
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 GMT
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 */
 }



Mime
View raw message