From 0b577d8ebd8c7a35ad4c84ed1bc048f21bb2d9d6 Mon Sep 17 00:00:00 2001 From: Robert Godfrey Date: Mon, 18 Aug 2014 18:13:09 +0000 Subject: QPID-6014 : [Java] declare variables as ConcurrentMap not ConcurrentHashMap to avoid linking issues after compiling under Java 8 git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1618690 13f79535-47bb-0310-9956-ffa450edef68 --- .../store/berkeleydb/StandardEnvironmentFacade.java | 18 +++++++++--------- .../replication/ReplicatedEnvironmentFacade.java | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) (limited to 'qpid/java/bdbstore/src') diff --git a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/StandardEnvironmentFacade.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/StandardEnvironmentFacade.java index 6451bc6927..a3b3ec7324 100644 --- a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/StandardEnvironmentFacade.java +++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/StandardEnvironmentFacade.java @@ -24,28 +24,28 @@ import java.io.File; import java.util.HashMap; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; - -import com.sleepycat.je.DatabaseEntry; -import com.sleepycat.je.Sequence; -import com.sleepycat.je.SequenceConfig; - -import org.apache.log4j.Logger; -import org.apache.qpid.server.store.StoreFuture; +import java.util.concurrent.ConcurrentMap; import com.sleepycat.je.Database; import com.sleepycat.je.DatabaseConfig; +import com.sleepycat.je.DatabaseEntry; import com.sleepycat.je.DatabaseException; import com.sleepycat.je.Environment; import com.sleepycat.je.EnvironmentConfig; +import com.sleepycat.je.Sequence; +import com.sleepycat.je.SequenceConfig; import com.sleepycat.je.Transaction; +import org.apache.log4j.Logger; + +import org.apache.qpid.server.store.StoreFuture; public class StandardEnvironmentFacade implements EnvironmentFacade { private static final Logger LOGGER = Logger.getLogger(StandardEnvironmentFacade.class); private final String _storePath; - private final ConcurrentHashMap _cachedDatabases = new ConcurrentHashMap<>(); - private final ConcurrentHashMap _cachedSequences = new ConcurrentHashMap<>(); + private final ConcurrentMap _cachedDatabases = new ConcurrentHashMap<>(); + private final ConcurrentMap _cachedSequences = new ConcurrentHashMap<>(); private Environment _environment; private final Committer _committer; diff --git a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacade.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacade.java index d045ae01fa..4f47e0fa53 100644 --- a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacade.java +++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacade.java @@ -170,8 +170,8 @@ public class ReplicatedEnvironmentFacade implements EnvironmentFacade, StateChan private volatile ReplicatedEnvironment.State _lastKnownEnvironmentState; private volatile Durability _messageStoreDurability; - private final ConcurrentHashMap _cachedDatabases = new ConcurrentHashMap<>(); - private final ConcurrentHashMap _cachedSequences = new ConcurrentHashMap<>(); + private final ConcurrentMap _cachedDatabases = new ConcurrentHashMap<>(); + private final ConcurrentMap _cachedSequences = new ConcurrentHashMap<>(); private final Set _permittedNodes = new CopyOnWriteArraySet(); public ReplicatedEnvironmentFacade(ReplicatedEnvironmentConfiguration configuration) -- cgit v1.2.1