Repository: tomee Updated Branches: refs/heads/tomee-1.7.x c439d38cf -> 7cbbe78cd
Fix Java 1.7 issue Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/a802a7a1 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/a802a7a1 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/a802a7a1 Branch: refs/heads/tomee-1.7.x Commit: a802a7a1e892247bcd023124cb8ade01f7e31ce8 Parents: c439d38 Author: Jonathan Gallimore <[email protected]> Authored: Wed Aug 26 19:15:49 2015 +0100 Committer: Jonathan Gallimore <[email protected]> Committed: Wed Aug 26 19:15:49 2015 +0100 ---------------------------------------------------------------------- .../jdbc/managed/local/ManagedDataSource.java | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/a802a7a1/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/managed/local/ManagedDataSource.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/managed/local/ManagedDataSource.java b/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/managed/local/ManagedDataSource.java index 2ffd617..65fe6af 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/managed/local/ManagedDataSource.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/managed/local/ManagedDataSource.java @@ -17,14 +17,18 @@ package org.apache.openejb.resource.jdbc.managed.local; -import java.io.PrintWriter; -import java.lang.reflect.Proxy; -import java.sql.Connection; -import java.sql.SQLException; +import org.apache.openejb.util.reflection.Reflections; + import javax.sql.CommonDataSource; import javax.sql.DataSource; import javax.transaction.TransactionManager; import javax.transaction.TransactionSynchronizationRegistry; +import java.io.PrintWriter; +import java.lang.reflect.Proxy; +import java.sql.Connection; +import java.sql.SQLException; +import java.sql.SQLFeatureNotSupportedException; +import java.util.logging.Logger; public class ManagedDataSource implements DataSource { private static final Class<?>[] CONNECTION_CLASS = new Class<?>[]{Connection.class}; @@ -85,6 +89,11 @@ public class ManagedDataSource implements DataSource { return DataSource.class.isInstance(delegate) && DataSource.class.cast(delegate).isWrapperFor(iface); } + // @Override JDK7 + public Logger getParentLogger() throws SQLFeatureNotSupportedException { + return (Logger) Reflections.invokeByReflection(delegate, "getParentLogger", new Class<?>[0], null); + } + private Connection managed(final String u, final String p) { return (Connection) Proxy.newProxyInstance(Thread.currentThread().getContextClassLoader(), CONNECTION_CLASS, new ManagedConnection(delegate, transactionManager, registry, u, p));
