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/30 16:53:17 UTC
[06/17] tomee git commit: Revert "style"
Revert "style"
This reverts commit e9d42565a1d148fdb8be0f116796b0fc928d4e84.
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/fe611d74
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/fe611d74
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/fe611d74
Branch: refs/heads/tomee-1.7.x
Commit: fe611d74c7d1a278a6538f63ebfc78d4c26396a8
Parents: be8c551
Author: Jonathan Gallimore <jo...@jrg.me.uk>
Authored: Thu Jul 30 13:46:26 2015 +0100
Committer: Jonathan Gallimore <jo...@jrg.me.uk>
Committed: Thu Jul 30 13:46:26 2015 +0100
----------------------------------------------------------------------
.../main/java/org/apache/openejb/assembler/classic/Assembler.java | 1 +
.../openejb/resource/jdbc/managed/local/ManagedConnection.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/fe611d74/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
index 9913b64..ed3b18d 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
@@ -109,6 +109,7 @@ import org.apache.openejb.quartz.Scheduler;
import org.apache.openejb.resource.GeronimoConnectionManagerFactory;
import org.apache.openejb.resource.PropertiesFactory;
import org.apache.openejb.resource.jdbc.DataSourceFactory;
+import org.apache.openejb.resource.jdbc.managed.local.ManagedDataSource;
import org.apache.openejb.spi.ApplicationServer;
import org.apache.openejb.spi.ContainerSystem;
import org.apache.openejb.spi.SecurityService;
http://git-wip-us.apache.org/repos/asf/tomee/blob/fe611d74/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..68c3cff 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
@@ -247,7 +247,7 @@ public class ManagedConnection implements InvocationHandler {
}
}
- private static final class Key {
+ private static class Key {
private final CommonDataSource ds;
private final String user;
private final String pwd;