Author: baedke
Date: Fri Apr 26 11:41:32 2019
New Revision: 1858195
URL: http://svn.apache.org/viewvc?rev=1858195&view=rev
Log:
OAK-8278: RDBDataSourceFactory.CloseableDataSource doesn't implement
java.sql.Wrapper correctly
CloseableDataSource now wraps it's internal DataSource instance.
Modified:
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDataSourceFactory.java
Modified:
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDataSourceFactory.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDataSourceFactory.java?rev=1858195&r1=1858194&r2=1858195&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDataSourceFactory.java
(original)
+++
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDataSourceFactory.java
Fri Apr 26 11:41:32 2019
@@ -134,12 +134,12 @@ public class RDBDataSourceFactory {
@Override
public boolean isWrapperFor(Class<?> c) throws SQLException {
- return this.ds.isWrapperFor(c);
+ return c.isInstance(this.ds) || this.ds.isWrapperFor(c);
}
@Override
public <T> T unwrap(Class<T> c) throws SQLException {
- return this.ds.unwrap(c);
+ return c.isInstance(this.ds) ? (T) this.ds : this.ds.unwrap(c);
}
@Override
