You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jl...@apache.org on 2016/12/03 16:56:08 UTC
[14/50] tomee git commit: Backporting - Java 6 fixes
Backporting - Java 6 fixes
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/2b07bcd1
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/2b07bcd1
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/2b07bcd1
Branch: refs/heads/tomee-1.7.x
Commit: 2b07bcd18c8ee5416a1a9bf81b5df693c30ca366
Parents: 0fd8e6c
Author: Jonathan Gallimore <jo...@jrg.me.uk>
Authored: Mon May 30 22:24:19 2016 +0100
Committer: Jonathan Gallimore <jo...@jrg.me.uk>
Committed: Mon May 30 22:24:19 2016 +0100
----------------------------------------------------------------------
.../openejb/resource/GeronimoConnectionManagerFactory.java | 4 ++--
.../openejb/resource/GeronimoConnectionManagerFactoryTest.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/2b07bcd1/container/openejb-core/src/main/java/org/apache/openejb/resource/GeronimoConnectionManagerFactory.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/resource/GeronimoConnectionManagerFactory.java b/container/openejb-core/src/main/java/org/apache/openejb/resource/GeronimoConnectionManagerFactory.java
index 9f22091..f2e83a8 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/resource/GeronimoConnectionManagerFactory.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/resource/GeronimoConnectionManagerFactory.java
@@ -495,14 +495,14 @@ public class GeronimoConnectionManagerFactory {
try {
final Map<ManagedConnection, ManagedConnectionInfo> connections;
if (stack instanceof SinglePoolConnectionInterceptor) {
- connections = new HashMap<>();
+ connections = new HashMap<ManagedConnection, ManagedConnectionInfo>();
for (final ManagedConnectionInfo info : (List<ManagedConnectionInfo>) pool) {
connections.put(info.getManagedConnection(), info);
}
} else if (stack instanceof SinglePoolMatchAllConnectionInterceptor) {
connections = (Map<ManagedConnection, ManagedConnectionInfo>) pool;
} else {
- connections = new HashMap<>();
+ connections = new HashMap<ManagedConnection, ManagedConnectionInfo>();
}
for (final ManagedConnectionInfo info : autoConnectionTracker.connections()) {
connections.put(info.getManagedConnection(), info);
http://git-wip-us.apache.org/repos/asf/tomee/blob/2b07bcd1/container/openejb-core/src/test/java/org/apache/openejb/resource/GeronimoConnectionManagerFactoryTest.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/resource/GeronimoConnectionManagerFactoryTest.java b/container/openejb-core/src/test/java/org/apache/openejb/resource/GeronimoConnectionManagerFactoryTest.java
index e2a5646..8a84b6f 100644
--- a/container/openejb-core/src/test/java/org/apache/openejb/resource/GeronimoConnectionManagerFactoryTest.java
+++ b/container/openejb-core/src/test/java/org/apache/openejb/resource/GeronimoConnectionManagerFactoryTest.java
@@ -68,7 +68,7 @@ public class GeronimoConnectionManagerFactoryTest {
}
public static class MyMcf implements ManagedConnectionFactory, ValidatingManagedConnectionFactory {
- private final Set<ManagedConnection> connections = new HashSet<>();
+ private final Set<ManagedConnection> connections = new HashSet<ManagedConnection>();
private final AtomicBoolean evicted = new AtomicBoolean(false);
private final AtomicBoolean destroyed = new AtomicBoolean(false);