diff options
Diffstat (limited to 'qpid/java/bdbstore/src/main/java')
3 files changed, 12 insertions, 12 deletions
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<String, Database> _cachedDatabases = new ConcurrentHashMap<>(); - private final ConcurrentHashMap<DatabaseEntry, Sequence> _cachedSequences = new ConcurrentHashMap<>(); + private final ConcurrentMap<String, Database> _cachedDatabases = new ConcurrentHashMap<>(); + private final ConcurrentMap<DatabaseEntry, Sequence> _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<String, Database> _cachedDatabases = new ConcurrentHashMap<>(); - private final ConcurrentHashMap<DatabaseEntry, Sequence> _cachedSequences = new ConcurrentHashMap<>(); + private final ConcurrentMap<String, Database> _cachedDatabases = new ConcurrentHashMap<>(); + private final ConcurrentMap<DatabaseEntry, Sequence> _cachedSequences = new ConcurrentHashMap<>(); private final Set<String> _permittedNodes = new CopyOnWriteArraySet<String>(); public ReplicatedEnvironmentFacade(ReplicatedEnvironmentConfiguration configuration) diff --git a/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/show.js b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/show.js index b5e12a664e..d914e16dc9 100644 --- a/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/show.js +++ b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/show.js @@ -75,7 +75,7 @@ define(["dojo/_base/xhr", if (!success) { - alert("Error:" + failureReason); + util.xhrErrorHandler(failureReason); } return success; } |