You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2021/06/01 22:36:06 UTC
[commons-dbcp] branch master updated: Remove obsolete Ant comment.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-dbcp.git
The following commit(s) were added to refs/heads/master by this push:
new 137f82c Remove obsolete Ant comment.
137f82c is described below
commit 137f82c2c5411c6f401db8b735f6ad830c16f13a
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Tue Jun 1 18:36:01 2021 -0400
Remove obsolete Ant comment.
---
src/main/java/org/apache/commons/dbcp2/DelegatingDatabaseMetaData.java | 2 --
src/main/java/org/apache/commons/dbcp2/PoolingDataSource.java | 1 -
.../java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java | 2 --
.../org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java | 1 -
.../java/org/apache/commons/dbcp2/TestDelegatingDatabaseMetaData.java | 1 -
src/test/java/org/apache/commons/dbcp2/TesterDatabaseMetaData.java | 2 --
.../org/apache/commons/dbcp2/datasources/PooledConnectionProxy.java | 2 --
7 files changed, 11 deletions(-)
diff --git a/src/main/java/org/apache/commons/dbcp2/DelegatingDatabaseMetaData.java b/src/main/java/org/apache/commons/dbcp2/DelegatingDatabaseMetaData.java
index e6a7092..75b75e8 100644
--- a/src/main/java/org/apache/commons/dbcp2/DelegatingDatabaseMetaData.java
+++ b/src/main/java/org/apache/commons/dbcp2/DelegatingDatabaseMetaData.java
@@ -1804,8 +1804,6 @@ public class DelegatingDatabaseMetaData implements DatabaseMetaData {
}
}
- /* JDBC_4_ANT_KEY_BEGIN */
-
@Override
public boolean supportsSubqueriesInComparisons() throws SQLException {
try {
diff --git a/src/main/java/org/apache/commons/dbcp2/PoolingDataSource.java b/src/main/java/org/apache/commons/dbcp2/PoolingDataSource.java
index 3768ea9..2ba83cd 100644
--- a/src/main/java/org/apache/commons/dbcp2/PoolingDataSource.java
+++ b/src/main/java/org/apache/commons/dbcp2/PoolingDataSource.java
@@ -105,7 +105,6 @@ public class PoolingDataSource<C extends Connection> implements DataSource, Auto
this.accessToUnderlyingConnectionAllowed = allow;
}
- /* JDBC_4_ANT_KEY_BEGIN */
@Override
public boolean isWrapperFor(final Class<?> iface) throws SQLException {
return iface != null && iface.isInstance(this);
diff --git a/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java b/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java
index ec74156..f5fbd14 100644
--- a/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java
+++ b/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java
@@ -128,7 +128,6 @@ class PooledConnectionImpl
}
}
- /* JDBC_4_ANT_KEY_BEGIN */
@Override
public void addStatementEventListener(final StatementEventListener listener) {
if (!statementEventListeners.contains(listener)) {
@@ -697,7 +696,6 @@ class PooledConnectionImpl
eventListeners.remove(listener);
}
- /* JDBC_4_ANT_KEY_BEGIN */
@Override
public void removeStatementEventListener(final StatementEventListener listener) {
statementEventListeners.remove(listener);
diff --git a/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java b/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java
index 6ed6054..f68d789 100644
--- a/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java
+++ b/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java
@@ -162,7 +162,6 @@ public abstract class InstanceKeyDataSource implements DataSource, Referenceable
protected abstract PooledConnectionManager getConnectionManager(UserPassKey upkey);
- /* JDBC_4_ANT_KEY_BEGIN */
@Override
public boolean isWrapperFor(final Class<?> iface) throws SQLException {
return iface.isInstance(this);
diff --git a/src/test/java/org/apache/commons/dbcp2/TestDelegatingDatabaseMetaData.java b/src/test/java/org/apache/commons/dbcp2/TestDelegatingDatabaseMetaData.java
index 44b6cfb..d2ec422 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestDelegatingDatabaseMetaData.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestDelegatingDatabaseMetaData.java
@@ -56,7 +56,6 @@ public class TestDelegatingDatabaseMetaData {
}
@Test
- /* JDBC_4_ANT_KEY_BEGIN */
public void testCheckOpen() throws Exception {
delegate = new DelegatingDatabaseMetaData(conn, conn.getMetaData());
final ResultSet rst = delegate.getSchemas();
diff --git a/src/test/java/org/apache/commons/dbcp2/TesterDatabaseMetaData.java b/src/test/java/org/apache/commons/dbcp2/TesterDatabaseMetaData.java
index 586f6fe..d9407e8 100644
--- a/src/test/java/org/apache/commons/dbcp2/TesterDatabaseMetaData.java
+++ b/src/test/java/org/apache/commons/dbcp2/TesterDatabaseMetaData.java
@@ -881,8 +881,6 @@ public class TesterDatabaseMetaData implements DatabaseMetaData {
return false;
}
- /* JDBC_4_ANT_KEY_BEGIN */
-
@Override
public boolean isWrapperFor(final Class<?> iface) throws SQLException {
return false;
diff --git a/src/test/java/org/apache/commons/dbcp2/datasources/PooledConnectionProxy.java b/src/test/java/org/apache/commons/dbcp2/datasources/PooledConnectionProxy.java
index bf04962..2e0002f 100644
--- a/src/test/java/org/apache/commons/dbcp2/datasources/PooledConnectionProxy.java
+++ b/src/test/java/org/apache/commons/dbcp2/datasources/PooledConnectionProxy.java
@@ -81,7 +81,6 @@ public class PooledConnectionProxy implements PooledConnection,
eventListeners.remove(listener);
}
- /* JDBC_4_ANT_KEY_BEGIN */
@Override
public void removeStatementEventListener(final StatementEventListener listener) {
eventListeners.remove(listener);
@@ -117,7 +116,6 @@ public class PooledConnectionProxy implements PooledConnection,
}
}
- /* JDBC_4_ANT_KEY_BEGIN */
@Override
public void addStatementEventListener(final StatementEventListener listener) {
if (!eventListeners.contains(listener)) {