You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jg...@apache.org on 2015/07/21 20:36:32 UTC
[15/16] tomee git commit: Backported from master
Backported from master
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/cbd55c31
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/cbd55c31
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/cbd55c31
Branch: refs/heads/tomee-1.7.x
Commit: cbd55c3135865933458b981abcc6f3d76dd985fc
Parents: 39cbaca
Author: Jonathan Gallimore <jo...@jrg.me.uk>
Authored: Tue Jul 21 16:48:52 2015 +0100
Committer: Jonathan Gallimore <jo...@jrg.me.uk>
Committed: Tue Jul 21 16:48:52 2015 +0100
----------------------------------------------------------------------
.../jdbc/managed/local/ManagedConnection.java | 2 +-
.../jdbc/managed/local/ManagedDataSource.java | 5 ---
.../jdbc/ManagedConnectionBehaviorTest.java | 32 +-------------------
3 files changed, 2 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/cbd55c31/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 6e30c30..3fc6d78 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(key));
+ Connection connection = Connection.class.cast(registry.getResource(transaction));
if (connection == null && delegate == null) {
newConnection();
connection = delegate;
http://git-wip-us.apache.org/repos/asf/tomee/blob/cbd55c31/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 0c10b80..82befc6 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,11 +88,6 @@ 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/cbd55c31/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 a5e65cd..b84a8b5 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<>();
+ private final Collection<MyConn> connections = new LinkedList<MyConn>();
@Override
public Connection getConnection() throws SQLException {
@@ -162,11 +162,6 @@ public class ManagedConnectionBehaviorTest {
}
@Override
- public Logger getParentLogger() throws SQLFeatureNotSupportedException {
- return null;
- }
-
- @Override
public <T> T unwrap(final Class<T> iface) throws SQLException {
return null;
}
@@ -424,31 +419,6 @@ 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;
}