erroneous java.sql.Wrapper implementation

Fixed and deployed a 2.1.3-SNAPSHOT version in the codehaus snapshot repository containing the fix.

Is the code in 2.1.3 a proper fix for this? The Javadoc for java.sql.Wrapper.isWrapperFor() reads (emphasis my own):

Returns true if this either implements the interface argument or is directly or indirectly a wrapper for an object that does.

That suggests that unwrap() should check if the delegate is itself a wrapper and call unwrap() on it if necessary, i.e.:

public <T> T unwrap(Class<T> iface) throws SQLException {
    if (iface.isInstance(delegate))
        return (T) delegate;

    if (delegate instanceof Wrapper)
        return ((Wrapper)delegate).unwrap(iface);

    throw new SQLException(getClass().getName() + " is not a wrapper for " + iface.getName());
}

Same for isWrapperFor().

Indeed, this was overlooked.

I'll fix this for the next release, thanks!

I committed a slightly different (but apparently equivalent) patch to the master branch: http://git.codehaus.org/gitweb.cgi?p=btm-git.git;a=commit;h=25e15a125985ce25ff22213414d92e83521634fd. I'd be happy if you could review it and report back the outcome.

Thanks!

Sorry for the late feedback. I missed the notice that this issue had changed.

I had a look at the changeset and noticed two points:

First, the change to PoolingDataSource mangles the two cases that the xaDataSource may implement the requested interface directly or that it itself may be a wrapper.

Second, is it possible that a wrapped delegate might only implement JDBC 3 interfaces and thus lack the methods from interface Wrapper? I think JLS-13.4.16 applies here which means a call to isWrapperFor() or unwrap() may fail with an AbstractMethodError.