Revert "Backported from master" This reverts commit cbd55c3135865933458b981abcc6f3d76dd985fc.
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/2a7fc7e9 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/2a7fc7e9 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/2a7fc7e9 Branch: refs/heads/tomee-1.7.x Commit: 2a7fc7e92ef220df38bcb437ea69cc1cf7091030 Parents: bdb9cf6 Author: Jonathan Gallimore <[email protected]> Authored: Thu Jul 30 13:46:04 2015 +0100 Committer: Jonathan Gallimore <[email protected]> Committed: Thu Jul 30 13:46:04 2015 +0100 ---------------------------------------------------------------------- .../jdbc/managed/local/ManagedConnection.java | 2 +- .../jdbc/managed/local/ManagedDataSource.java | 5 +++ .../jdbc/ManagedConnectionBehaviorTest.java | 32 +++++++++++++++++++- 3 files changed, 37 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/2a7fc7e9/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/managed/local/ManagedConnection.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/managed/local/ManagedConnection.java b/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/managed/local/ManagedConnection.java index 3fc6d78..6e30c30 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/managed/local/ManagedConnection.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/managed/local/ManagedConnection.java @@ -112,7 +112,7 @@ public class ManagedConnection implements InvocationHandler { // get the already bound connection to the current transaction or enlist this one in the tx if (isUnderTransaction(transaction.getStatus())) { - Connection connection = Connection.class.cast(registry.getResource(transaction)); + Connection connection = Connection.class.cast(registry.getResource(key)); if (connection == null && delegate == null) { newConnection(); connection = delegate; http://git-wip-us.apache.org/repos/asf/tomee/blob/2a7fc7e9/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 82befc6..0c10b80 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 @@ -88,6 +88,11 @@ public class ManagedDataSource implements DataSource { return DataSource.class.isInstance(delegate) && DataSource.class.cast(delegate).isWrapperFor(iface); } + @Override + public Logger getParentLogger() throws SQLFeatureNotSupportedException { + return delegate.getParentLogger(); + } + 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)); http://git-wip-us.apache.org/repos/asf/tomee/blob/2a7fc7e9/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/ManagedConnectionBehaviorTest.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/ManagedConnectionBehaviorTest.java b/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/ManagedConnectionBehaviorTest.java index b84a8b5..a5e65cd 100644 --- a/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/ManagedConnectionBehaviorTest.java +++ b/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/ManagedConnectionBehaviorTest.java @@ -127,7 +127,7 @@ public class ManagedConnectionBehaviorTest { } public static class MyDs implements DataSource { - private final Collection<MyConn> connections = new LinkedList<MyConn>(); + private final Collection<MyConn> connections = new LinkedList<>(); @Override public Connection getConnection() throws SQLException { @@ -162,6 +162,11 @@ public class ManagedConnectionBehaviorTest { } @Override + public Logger getParentLogger() throws SQLFeatureNotSupportedException { + return null; + } + + @Override public <T> T unwrap(final Class<T> iface) throws SQLException { return null; } @@ -419,6 +424,31 @@ public class ManagedConnectionBehaviorTest { } @Override + public void setSchema(String schema) throws SQLException { + + } + + @Override + public String getSchema() throws SQLException { + return null; + } + + @Override + public void abort(Executor executor) throws SQLException { + + } + + @Override + public void setNetworkTimeout(Executor executor, int milliseconds) throws SQLException { + + } + + @Override + public int getNetworkTimeout() throws SQLException { + return 0; + } + + @Override public <T> T unwrap(Class<T> iface) throws SQLException { return null; }
