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 f12500a0 DelegatingConnection.setSchema(String) should delegate to
Jdbc41Bridge
f12500a0 is described below
commit f12500a00ebcf741f423ea997afdb3f6d54f2e03
Author: Gary Gregory <[email protected]>
AuthorDate: Mon Nov 4 16:03:44 2024 -0500
DelegatingConnection.setSchema(String) should delegate to Jdbc41Bridge
---
src/changes/changes.xml | 2 ++
src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 29373c5d..32af9da4 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -73,6 +73,8 @@ The <action> type attribute can be add,update,fix,remove.
<action type="fix" dev="ggregory" due-to="Gary Gregory">Fix SpotBugs
MC_OVERRIDABLE_METHOD_CALL_IN_READ_OBJECT in SharedPoolDataSource.</action>
<action type="fix" dev="ggregory" due-to="Johno Crawford">Avoid object
creation when invoking isDisconnectionSqlException #422.</action>
<action type="fix" issue="DBCP-599" dev="ggregory" due-to="denixx
baykin, Phil Steitz, Gary Gregory">PoolableConnectionFactory.destroyObject()
method behaves incorrectly on ABANDONED connection, issue with unhandled
AbstractMethodError.</action>
+ <action type="fix" dev="ggregory" due-to="Gary
Gregory">DelegatingConnection.setSchema(String) should delegate to
Jdbc41Bridge.</action>
+ <action type="fix" dev="ggregory" due-to="Gary
Gregory">DelegatingConnection.setSchema(String) should delegate to
Jdbc41Bridge.</action>
<!-- ADD -->
<action type="add" dev="ggregory" due-to="Johno Crawford, Gary
Gregory">Add support for ignoring non-fatal SQL state codes #421.</action>
<!-- UPDATE -->
diff --git a/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java
b/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java
index 9231246a..3aec922b 100644
--- a/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java
+++ b/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java
@@ -974,7 +974,7 @@ public class DelegatingConnection<C extends Connection>
extends AbandonedTrace i
try {
Jdbc41Bridge.setSchema(connection, schema);
if (cacheState) {
- cachedSchema = connection.getSchema();
+ cachedSchema = Jdbc41Bridge.getSchema(connection);
}
} catch (final SQLException e) {
cachedSchema = null;