From b12661fae29f5b647446c665ba7ebbaa5fbd6705 Mon Sep 17 00:00:00 2001 From: lukaseder Date: Mon, 7 Mar 2016 13:18:26 +0100 Subject: [PATCH] [#5134] OracleConnection Class not found when jOOQ runs in OSGi and ARRAY types are bound --- .../org/jooq/impl/DefaultExecuteContext.java | 33 +++++++------------ 1 file changed, 12 insertions(+), 21 deletions(-) diff --git a/jOOQ/src/main/java/org/jooq/impl/DefaultExecuteContext.java b/jOOQ/src/main/java/org/jooq/impl/DefaultExecuteContext.java index bc71549931..bbd8ad3c23 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DefaultExecuteContext.java +++ b/jOOQ/src/main/java/org/jooq/impl/DefaultExecuteContext.java @@ -70,6 +70,7 @@ import org.jooq.Routine; import org.jooq.SQLDialect; import org.jooq.Update; import org.jooq.conf.Settings; +import org.jooq.tools.JooqLogger; import org.jooq.tools.jdbc.JDBCUtils; import org.jooq.tools.reflect.Reflect; import org.jooq.tools.reflect.ReflectException; @@ -81,6 +82,8 @@ import org.jooq.tools.reflect.ReflectException; */ class DefaultExecuteContext implements ExecuteContext { + private static final JooqLogger log = JooqLogger.getLogger(DefaultExecuteContext.class); + // Persistent attributes (repeatable) private final Configuration configuration; private final Map data; @@ -268,27 +271,6 @@ class DefaultExecuteContext implements ExecuteContext { */ private static int maxUnwrappedConnections = 256; - - - - - - - - - - - - - - - - - - - - - /** * Get the registered connection's "target connection" if applicable. *

@@ -319,6 +301,15 @@ class DefaultExecuteContext implements ExecuteContext { + + + + + + + + + // Unwrap nested Spring org.springframework.jdbc.datasource.ConnectionProxy objects