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 --- .../src/main/java/org/apache/qpid/server/BrokerOptions.java | 3 ++- .../org/apache/qpid/server/exchange/AbstractExchange.java | 3 ++- .../org/apache/qpid/server/exchange/DirectExchange.java | 3 ++- .../org/apache/qpid/server/exchange/HeadersExchange.java | 3 ++- .../qpid/server/exchange/topic/TopicExchangeResult.java | 13 +++++++------ .../qpid/server/exchange/topic/TopicWordDictionary.java | 3 ++- .../server/queue/AssignedConsumerMessageGroupManager.java | 9 +++++---- .../org/apache/qpid/server/queue/LastValueQueueList.java | 3 ++- .../org/apache/qpid/server/security/SecurityManager.java | 5 +++-- .../org/apache/qpid/server/store/AbstractMemoryStore.java | 3 ++- .../org/apache/qpid/server/store/MemoryMessageStore.java | 3 ++- .../qpid/server/queue/StandardQueueEntryListTest.java | 3 ++- 12 files changed, 33 insertions(+), 21 deletions(-) (limited to 'qpid/java/broker-core/src') diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/BrokerOptions.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/BrokerOptions.java index 418e5c2657..a6fae97aaa 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/BrokerOptions.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/BrokerOptions.java @@ -25,6 +25,7 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; import org.apache.qpid.server.configuration.BrokerProperties; import org.apache.qpid.server.model.ConfiguredObject; @@ -306,7 +307,7 @@ public class BrokerOptions */ public Map getConfigProperties() { - ConcurrentHashMap properties = new ConcurrentHashMap(); + ConcurrentMap properties = new ConcurrentHashMap(); properties.putAll(_configProperties); properties.putIfAbsent(QPID_WORK_DIR, getWorkDir()); diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java index e41bb948dc..4472669f4a 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java @@ -30,6 +30,7 @@ import java.util.Map; import java.util.Set; import java.util.UUID; import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; @@ -102,7 +103,7 @@ public abstract class AbstractExchange> private final CopyOnWriteArrayList _listeners = new CopyOnWriteArrayList(); - private final ConcurrentHashMap _bindingsMap = new ConcurrentHashMap(); + private final ConcurrentMap _bindingsMap = new ConcurrentHashMap(); private StateChangeListener _bindingListener; private State _state = State.UNINITIALIZED; diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/DirectExchange.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/DirectExchange.java index 4997095315..66de22ece8 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/DirectExchange.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/DirectExchange.java @@ -28,6 +28,7 @@ import java.util.List; import java.util.Map; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; import java.util.concurrent.CopyOnWriteArraySet; import org.apache.log4j.Logger; @@ -133,7 +134,7 @@ public class DirectExchange extends AbstractExchange } } - private final ConcurrentHashMap _bindingsByKey = + private final ConcurrentMap _bindingsByKey = new ConcurrentHashMap(); @ManagedObjectFactoryConstructor diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java index 83c6b9fd00..67bbc26f74 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java @@ -25,6 +25,7 @@ import java.util.LinkedHashSet; import java.util.ListIterator; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.CopyOnWriteArraySet; @@ -74,7 +75,7 @@ public class HeadersExchange extends AbstractExchange private static final Logger _logger = Logger.getLogger(HeadersExchange.class); - private final ConcurrentHashMap> _bindingsByKey = + private final ConcurrentMap> _bindingsByKey = new ConcurrentHashMap>(); private final CopyOnWriteArrayList _bindingHeaderMatchers = diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/topic/TopicExchangeResult.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/topic/TopicExchangeResult.java index d3a6bd9260..0db3e9b378 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/topic/TopicExchangeResult.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/topic/TopicExchangeResult.java @@ -20,11 +20,6 @@ */ package org.apache.qpid.server.exchange.topic; -import org.apache.qpid.server.binding.BindingImpl; -import org.apache.qpid.server.filter.Filterable; -import org.apache.qpid.server.filter.MessageFilter; -import org.apache.qpid.server.queue.AMQQueue; - import java.util.ArrayList; import java.util.Collection; import java.util.HashSet; @@ -32,13 +27,19 @@ import java.util.List; import java.util.Map; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; import java.util.concurrent.CopyOnWriteArrayList; +import org.apache.qpid.server.binding.BindingImpl; +import org.apache.qpid.server.filter.Filterable; +import org.apache.qpid.server.filter.MessageFilter; +import org.apache.qpid.server.queue.AMQQueue; + public final class TopicExchangeResult implements TopicMatcherResult { private final List _bindings = new CopyOnWriteArrayList(); private final Map _unfilteredQueues = new ConcurrentHashMap(); - private final ConcurrentHashMap> _filteredQueues = new ConcurrentHashMap>(); + private final ConcurrentMap> _filteredQueues = new ConcurrentHashMap>(); private volatile ArrayList _unfilteredQueueList = new ArrayList(0); public void addUnfilteredQueue(AMQQueue queue) diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/topic/TopicWordDictionary.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/topic/TopicWordDictionary.java index 24c41ee7da..181f1d32b7 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/topic/TopicWordDictionary.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/topic/TopicWordDictionary.java @@ -21,10 +21,11 @@ package org.apache.qpid.server.exchange.topic; import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; public class TopicWordDictionary { - private final ConcurrentHashMap _dictionary = + private final ConcurrentMap _dictionary = new ConcurrentHashMap(); public TopicWordDictionary() diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AssignedConsumerMessageGroupManager.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AssignedConsumerMessageGroupManager.java index 8220993e03..e1b25e5abb 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AssignedConsumerMessageGroupManager.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AssignedConsumerMessageGroupManager.java @@ -20,11 +20,12 @@ */ package org.apache.qpid.server.queue; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.util.Iterator; import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class AssignedConsumerMessageGroupManager implements MessageGroupManager @@ -33,7 +34,7 @@ public class AssignedConsumerMessageGroupManager implements MessageGroupManager private final String _groupId; - private final ConcurrentHashMap> _groupMap = new ConcurrentHashMap>(); + private final ConcurrentMap> _groupMap = new ConcurrentHashMap>(); private final int _groupMask; public AssignedConsumerMessageGroupManager(final String groupId, final int maxGroups) diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/LastValueQueueList.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/LastValueQueueList.java index 6f1edf12e5..1e250ac2c9 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/LastValueQueueList.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/LastValueQueueList.java @@ -24,6 +24,7 @@ package org.apache.qpid.server.queue; import java.util.Collections; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; import java.util.concurrent.atomic.AtomicReference; import org.slf4j.Logger; @@ -48,7 +49,7 @@ public class LastValueQueueList extends OrderedQueueEntryList }; private final String _conflationKey; - private final ConcurrentHashMap> _latestValuesMap = + private final ConcurrentMap> _latestValuesMap = new ConcurrentHashMap>(); private final ConflationQueueEntry _deleteInProgress = new ConflationQueueEntry(this); diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/SecurityManager.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/SecurityManager.java index 2f7acba91d..96bd9ee0d6 100755 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/SecurityManager.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/SecurityManager.java @@ -35,6 +35,7 @@ import java.util.Collection; import java.util.Collections; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; import javax.security.auth.Subject; @@ -63,11 +64,11 @@ public class SecurityManager implements ConfigurationChangeListener Collections.emptySet(), Collections.emptySet()); - private final ConcurrentHashMap _plugins = new ConcurrentHashMap(); + private final ConcurrentMap _plugins = new ConcurrentHashMap(); private final boolean _managementMode; private final Broker _broker; - private final ConcurrentHashMap _publishAccessCheckCache = new ConcurrentHashMap(); + private final ConcurrentMap _publishAccessCheckCache = new ConcurrentHashMap(); public SecurityManager(Broker broker, boolean managementMode) { diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractMemoryStore.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractMemoryStore.java index 4d5cb84d04..a9af138a02 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractMemoryStore.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractMemoryStore.java @@ -24,6 +24,7 @@ import java.util.ArrayList; import java.util.List; import java.util.UUID; import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; import org.apache.qpid.server.model.ConfiguredObject; import org.apache.qpid.server.store.handler.ConfiguredObjectRecordHandler; @@ -34,7 +35,7 @@ public abstract class AbstractMemoryStore implements DurableConfigurationStore, private final Class _rootClass; - private final ConcurrentHashMap _configuredObjectRecords = new ConcurrentHashMap(); + private final ConcurrentMap _configuredObjectRecords = new ConcurrentHashMap(); protected AbstractMemoryStore(final Class rootClass) { diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/MemoryMessageStore.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/MemoryMessageStore.java index f3b2cac52e..9c0a5118ff 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/MemoryMessageStore.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/MemoryMessageStore.java @@ -26,6 +26,7 @@ import java.util.Map; import java.util.Set; import java.util.UUID; import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; import java.util.concurrent.atomic.AtomicLong; import org.apache.qpid.server.message.EnqueueableMessage; @@ -41,7 +42,7 @@ public class MemoryMessageStore implements MessageStore private final AtomicLong _messageId = new AtomicLong(1); - private final ConcurrentHashMap _messages = new ConcurrentHashMap(); + private final ConcurrentMap _messages = new ConcurrentHashMap(); private final Object _transactionLock = new Object(); private final Map> _messageInstances = new HashMap>(); private final Map _distributedTransactions = new HashMap(); diff --git a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueEntryListTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueEntryListTest.java index 95c53c8428..28d22a5a44 100644 --- a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueEntryListTest.java +++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueEntryListTest.java @@ -28,6 +28,7 @@ import java.util.HashMap; import java.util.Map; import java.util.UUID; import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; import org.apache.qpid.server.configuration.updater.CurrentThreadTaskExecutor; import org.apache.qpid.server.logging.EventLogger; @@ -155,7 +156,7 @@ public class StandardQueueEntryListTest extends QueueEntryListTestBase public void testScavenge() throws Exception { OrderedQueueEntryList sqel = new StandardQueueEntryList(null); - ConcurrentHashMap entriesMap = new ConcurrentHashMap(); + ConcurrentMap entriesMap = new ConcurrentHashMap(); //Add messages to generate QueueEntry's -- cgit v1.2.1