Author: markt
Date: Mon Dec 9 20:54:55 2013
New Revision: 1549678
URL: http://svn.apache.org/r1549678
Log:
DBCP-380
Correct implementation of DelegatingConnection.isWrapperFor() so it works
correctly with older JDBC drivers.
Patch provided by Balazs Zsoldos.
Modified:
commons/proper/dbcp/branches/DBCP_1_5_x_BRANCH/src/changes/changes.xml
commons/proper/dbcp/branches/DBCP_1_5_x_BRANCH/src/java/org/apache/commons/dbcp/DelegatingConnection.java
Modified: commons/proper/dbcp/branches/DBCP_1_5_x_BRANCH/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/commons/proper/dbcp/branches/DBCP_1_5_x_BRANCH/src/changes/changes.xml?rev=1549678&r1=1549677&r2=1549678&view=diff
==============================================================================
--- commons/proper/dbcp/branches/DBCP_1_5_x_BRANCH/src/changes/changes.xml
(original)
+++ commons/proper/dbcp/branches/DBCP_1_5_x_BRANCH/src/changes/changes.xml Mon
Dec 9 20:54:55 2013
@@ -51,6 +51,10 @@ The <action> type attribute can be add,u
<action dev="markt" issue="DBCP-396" type="fix">
Expose all of the AbandonedConfig properties through a BasicDataSource.
</action>
+ <action dev="markt" issue="DBCP-380" type="fix" due-to="Balazs Zsoldos">
+ Correct implementation of DelegatingConnection.isWrapperFor() so it
+ works correctly with older JDBC drivers.
+ </action>
</release>
<release version="1.4.1" date="TBD" description="TBD">
<action dev="psteitz" issue="DBCP-367" type="fix" due-to="Ken
Tatsushita">
Modified:
commons/proper/dbcp/branches/DBCP_1_5_x_BRANCH/src/java/org/apache/commons/dbcp/DelegatingConnection.java
URL:
http://svn.apache.org/viewvc/commons/proper/dbcp/branches/DBCP_1_5_x_BRANCH/src/java/org/apache/commons/dbcp/DelegatingConnection.java?rev=1549678&r1=1549677&r2=1549678&view=diff
==============================================================================
---
commons/proper/dbcp/branches/DBCP_1_5_x_BRANCH/src/java/org/apache/commons/dbcp/DelegatingConnection.java
(original)
+++
commons/proper/dbcp/branches/DBCP_1_5_x_BRANCH/src/java/org/apache/commons/dbcp/DelegatingConnection.java
Mon Dec 9 20:54:55 2013
@@ -709,7 +709,13 @@ public class DelegatingConnection extend
/* JDBC_4_ANT_KEY_BEGIN */
public boolean isWrapperFor(Class<?> iface) throws SQLException {
- return iface.isAssignableFrom(getClass()) || _conn.isWrapperFor(iface);
+ if (iface.isAssignableFrom(getClass())) {
+ return true;
+ } else if (iface.isAssignableFrom(_conn.getClass())) {
+ return true;
+ } else {
+ return _conn.isWrapperFor(iface);
+ }
}
public <T> T unwrap(Class<T> iface) throws SQLException {
