You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2018/01/29 14:27:19 UTC
[11/11] qpid-broker-j git commit: QPID-8032 : [Broker-J] Address
review comments
QPID-8032 : [Broker-J] Address review comments
(cherry picked from commit c6cde241692c8840ad2c36e6ce4645be60d8adb7)
Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/4e6c44d1
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/4e6c44d1
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/4e6c44d1
Branch: refs/heads/7.0.x
Commit: 4e6c44d10d459b9dd0b55c2d4c0bb1347c014d5c
Parents: c24f1b73
Author: Alex Rudyy <or...@apache.org>
Authored: Wed Jan 24 13:21:59 2018 +0000
Committer: Alex Rudyy <or...@apache.org>
Committed: Mon Jan 29 14:04:12 2018 +0000
----------------------------------------------------------------------
.../org/apache/qpid/server/protocol/v0_10/ServerSession.java | 6 +++---
.../java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/4e6c44d1/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSession.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSession.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSession.java
index b224fa6..e2211dd 100644
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSession.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSession.java
@@ -45,16 +45,17 @@ import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
+import java.util.Deque;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
-import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.SortedMap;
import java.util.UUID;
import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentLinkedDeque;
import java.util.concurrent.ConcurrentSkipListMap;
import java.util.concurrent.Semaphore;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -109,6 +110,7 @@ public class ServerSession extends SessionInvoker
private static final int UNFINISHED_COMMAND_QUEUE_THRESHOLD = 500;
private final Set<Object> _blockingEntities = Collections.synchronizedSet(new HashSet<>());
+ private final Deque<AsyncCommand> _unfinishedCommandsQueue = new ConcurrentLinkedDeque<>();
private final AtomicBoolean _blocking = new AtomicBoolean(false);
private final AtomicInteger _outstandingCredit = new AtomicInteger(UNLIMITED_CREDIT);
@@ -1596,8 +1598,6 @@ public class ServerSession extends SessionInvoker
return _blocking.get();
}
- private final LinkedList<AsyncCommand> _unfinishedCommandsQueue = new LinkedList<AsyncCommand>();
-
public void completeAsyncCommands()
{
AsyncCommand cmd;
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/4e6c44d1/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
index 70de9cc..e106a3f 100644
--- a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
+++ b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
@@ -33,11 +33,11 @@ import java.util.EnumSet;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashMap;
-import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.UUID;
+import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.atomic.AtomicBoolean;
import javax.security.auth.Subject;
@@ -155,7 +155,7 @@ public class AMQChannel extends AbstractAMQPSession<AMQChannel, ConsumerTarget_0
private final MessageStore _messageStore;
- private final LinkedList<AsyncCommand> _unfinishedCommandsQueue = new LinkedList<AsyncCommand>();
+ private final java.util.Queue<AsyncCommand> _unfinishedCommandsQueue = new ConcurrentLinkedQueue<>();
private final UnacknowledgedMessageMap _unacknowledgedMessageMap;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org