commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sebb <seb...@gmail.com>
Subject Re: svn commit: r891144 - /commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/DelegatingConnection.java
Date Wed, 16 Dec 2009 12:06:34 GMT
On 16/12/2009, joehni@apache.org <joehni@apache.org> wrote:
> Author: joehni
>  Date: Wed Dec 16 07:38:09 2009
>  New Revision: 891144
>
>  URL: http://svn.apache.org/viewvc?rev=891144&view=rev
>  Log:
>  Restore Ant markers.
>
>  Modified:
>     commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/DelegatingConnection.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=891144&r1=891143&r2=891144&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
Wed Dec 16 07:38:09 2009
>  @@ -17,27 +17,29 @@
>
>   package org.apache.commons.dbcp;
>
>  -import java.sql.Array;
>  -import java.sql.Blob;
>   import java.sql.CallableStatement;
>  -import java.sql.ClientInfoStatus;
>  -import java.sql.Clob;
>   import java.sql.Connection;
>   import java.sql.DatabaseMetaData;
>  -import java.sql.NClob;
>   import java.sql.PreparedStatement;
>  -import java.sql.ResultSet;
>  -import java.sql.SQLClientInfoException;
>   import java.sql.SQLException;
>   import java.sql.SQLWarning;
>  -import java.sql.SQLXML;
>   import java.sql.Statement;
>  -import java.sql.Struct;
>  -import java.util.Collections;
>   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.SQLClientInfoException;
>  +import java.sql.SQLXML;
>  +import java.sql.Struct;
>  +import java.util.Collections;
>   import java.util.Properties;
>  +/* JDBC_4_ANT_KEY_END */
>
>   /**
>   * A base delegating implementation of {@link Connection}.
>  @@ -436,6 +438,11 @@
>          }
>      }
>
>  +    // ------------------- JDBC 3.0 -----------------------------------------
>  +    // Will be commented by the build process on a JDBC 2.0 system
>  +
>  +/* JDBC_3_ANT_KEY_BEGIN */

DBCP no longer needs JDBC_3 markers; these have already been removed.

>  +
>      public int getHoldability() throws SQLException
>      { checkOpen(); try { return _conn.getHoldability(); } catch (SQLException e) { handleException(e);
return 0; } }
>
>  @@ -531,7 +538,7 @@
>              return null;
>          }
>      }
>  -
>  +/* JDBC_3_ANT_KEY_END */

DBCP no longer needs JDBC_3 markers; these have already been removed.

>   /* JDBC_4_ANT_KEY_BEGIN */
>
>      public boolean isWrapperFor(Class<?> iface) throws SQLException {
>
>
>

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
For additional commands, e-mail: dev-help@commons.apache.org


Mime
View raw message