summaryrefslogtreecommitdiff
path: root/qpid/java/broker-plugins
diff options
context:
space:
mode:
authorRobert Godfrey <rgodfrey@apache.org>2014-08-18 18:13:09 +0000
committerRobert Godfrey <rgodfrey@apache.org>2014-08-18 18:13:09 +0000
commit0b577d8ebd8c7a35ad4c84ed1bc048f21bb2d9d6 (patch)
tree48c5630c3edb97ce97ff6bdf0ef3a9f5b2b1d6e6 /qpid/java/broker-plugins
parent0aac869c52d2e75dd8ff82a6dfb76ee210fd4af8 (diff)
downloadqpid-python-0b577d8ebd8c7a35ad4c84ed1bc048f21bb2d9d6.tar.gz
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
Diffstat (limited to 'qpid/java/broker-plugins')
-rw-r--r--qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java
index a8fc5387b4..deaa3ef50b 100644
--- a/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java
+++ b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java
@@ -30,6 +30,7 @@ import java.util.List;
import java.util.Map;
import java.util.UUID;
import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
import org.apache.log4j.Logger;
@@ -92,7 +93,7 @@ public class SendingLink_1_0 implements SendingLinkListener, Link_1_0, DeliveryS
private final Map<Binary, MessageInstance> _unsettledMap =
new HashMap<Binary, MessageInstance>();
- private final ConcurrentHashMap<Binary, UnsettledAction> _unsettledActionMap =
+ private final ConcurrentMap<Binary, UnsettledAction> _unsettledActionMap =
new ConcurrentHashMap<Binary, UnsettledAction>();
private volatile SendingLinkAttachment _linkAttachment;
private TerminusDurability _durability;