Author: markt
Date: Wed Jan 14 05:47:53 2009
New Revision: 734396
URL: http://svn.apache.org/viewvc?rev=734396&view=rev
Log:
Add build flags to new JDBC 4 methods that use generics
Modified:
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/BasicDataSource.java
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/PoolingDataSource.java
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/datasources/InstanceKeyDataSource.java
Modified:
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/BasicDataSource.java
URL:
http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/BasicDataSource.java?rev=734396&r1=734395&r2=734396&view=diff
==============================================================================
---
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/BasicDataSource.java
(original)
+++
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/BasicDataSource.java
Wed Jan 14 05:47:53 2009
@@ -1162,6 +1162,7 @@
return closed;
}
+ /* JDBC_4_ANT_KEY_BEGIN */
public boolean isWrapperFor(Class<?> iface) throws SQLException {
return false;
}
@@ -1169,6 +1170,7 @@
public <T> T unwrap(Class<T> iface) throws SQLException {
throw new SQLException("BasicDataSource is not a wrapper.");
}
+ /* JDBC_4_ANT_KEY_END */
// ------------------------------------------------------ Protected Methods
Modified:
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/PoolingDataSource.java
URL:
http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/PoolingDataSource.java?rev=734396&r1=734395&r2=734396&view=diff
==============================================================================
---
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/PoolingDataSource.java
(original)
+++
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/PoolingDataSource.java
Wed Jan 14 05:47:53 2009
@@ -85,6 +85,7 @@
this.accessToUnderlyingConnectionAllowed = allow;
}
+ /* JDBC_4_ANT_KEY_BEGIN */
public boolean isWrapperFor(Class<?> iface) throws SQLException {
return false;
}
@@ -92,6 +93,7 @@
public <T> T unwrap(Class<T> iface) throws SQLException {
throw new SQLException("PoolingDataSource is not a wrapper.");
}
+ /* JDBC_4_ANT_KEY_END */
//--- DataSource methods -----------------------------------------
Modified:
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/datasources/InstanceKeyDataSource.java
URL:
http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/datasources/InstanceKeyDataSource.java?rev=734396&r1=734395&r2=734396&view=diff
==============================================================================
---
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/datasources/InstanceKeyDataSource.java
(original)
+++
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/datasources/InstanceKeyDataSource.java
Wed Jan 14 05:47:53 2009
@@ -154,6 +154,7 @@
*/
public abstract void close() throws Exception;
+ /* JDBC_4_ANT_KEY_BEGIN */
public boolean isWrapperFor(Class<?> iface) throws SQLException {
return false;
}
@@ -161,6 +162,7 @@
public <T> T unwrap(Class<T> iface) throws SQLException {
throw new SQLException("InstanceKeyDataSource is not a wrapper.");
}
+ /* JDBC_4_ANT_KEY_END */
// -------------------------------------------------------------------
// Properties
