Author: markt Date: Thu Feb 19 13:30:01 2009 New Revision: 745853 URL: http://svn.apache.org/viewvc?rev=745853&view=rev Log: Check the object we are wrapping rather than the connection. Copy and paste error in original patch?
Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/DelegatingStatement.java Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/DelegatingStatement.java URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/DelegatingStatement.java?rev=745853&r1=745852&r2=745853&view=diff ============================================================================== --- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/DelegatingStatement.java (original) +++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/DelegatingStatement.java Thu Feb 19 13:30:01 2009 @@ -355,16 +355,16 @@ /* JDBC_4_ANT_KEY_BEGIN */ public boolean isWrapperFor(Class<?> iface) throws SQLException { - return iface.isAssignableFrom(getClass()) || _conn.isWrapperFor(iface); + return iface.isAssignableFrom(getClass()) || _stmt.isWrapperFor(iface); } public <T> T unwrap(Class<T> iface) throws SQLException { if (iface.isAssignableFrom(getClass())) { return iface.cast(this); - } else if (iface.isAssignableFrom(_conn.getClass())) { - return iface.cast(_conn); + } else if (iface.isAssignableFrom(_stmt.getClass())) { + return iface.cast(_stmt); } else { - return _conn.unwrap(iface); + return _stmt.unwrap(iface); } }