You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2015/01/16 17:30:48 UTC
[2/5] qpid-jms git commit: rebase max value constant and update usage
accordingly for clarity
rebase max value constant and update usage accordingly for clarity
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/4249b68d
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/4249b68d
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/4249b68d
Branch: refs/heads/master
Commit: 4249b68d08e1836d6390dc4dbb3d7de0af9a27ee
Parents: 28dc394
Author: Robert Gemmell <ro...@apache.org>
Authored: Fri Jan 16 15:39:05 2015 +0000
Committer: Robert Gemmell <ro...@apache.org>
Committed: Fri Jan 16 15:39:05 2015 +0000
----------------------------------------------------------------------
.../qpid/jms/util/PriorityMessageQueue.java | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/4249b68d/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/PriorityMessageQueue.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/PriorityMessageQueue.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/PriorityMessageQueue.java
index 75a48e1..6e7c984 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/PriorityMessageQueue.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/PriorityMessageQueue.java
@@ -31,15 +31,16 @@ import org.apache.qpid.jms.message.JmsInboundMessageDispatch;
*/
public final class PriorityMessageQueue extends AbstractMessageQueue {
- private static final Integer MAX_PRIORITY = 10;
+ // There are 10 priorities, values 0-9
+ private static final Integer MAX_PRIORITY = 9;
private final LinkedList<JmsInboundMessageDispatch>[] lists;
private int size = 0;
@SuppressWarnings("unchecked")
public PriorityMessageQueue() {
- this.lists = new LinkedList[MAX_PRIORITY];
- for (int i = 0; i < MAX_PRIORITY; i++) {
+ this.lists = new LinkedList[MAX_PRIORITY + 1];
+ for (int i = 0; i <= MAX_PRIORITY; i++) {
lists[i] = new LinkedList<JmsInboundMessageDispatch>();
}
}
@@ -56,7 +57,7 @@ public final class PriorityMessageQueue extends AbstractMessageQueue {
@Override
public void enqueueFirst(JmsInboundMessageDispatch envelope) {
synchronized (lock) {
- getList(MAX_PRIORITY - 1).addFirst(envelope);
+ getList(MAX_PRIORITY).addFirst(envelope);
this.size++;
lock.notify();
}
@@ -79,7 +80,7 @@ public final class PriorityMessageQueue extends AbstractMessageQueue {
@Override
public void clear() {
synchronized (lock) {
- for (int i = 0; i < MAX_PRIORITY; i++) {
+ for (int i = 0; i <= MAX_PRIORITY; i++) {
lists[i].clear();
}
this.size = 0;
@@ -90,7 +91,7 @@ public final class PriorityMessageQueue extends AbstractMessageQueue {
public List<JmsInboundMessageDispatch> removeAll() {
synchronized (lock) {
ArrayList<JmsInboundMessageDispatch> result = new ArrayList<JmsInboundMessageDispatch>(size());
- for (int i = MAX_PRIORITY - 1; i >= 0; i--) {
+ for (int i = MAX_PRIORITY; i >= 0; i--) {
List<JmsInboundMessageDispatch> list = lists[i];
result.addAll(list);
size -= list.size();
@@ -103,7 +104,7 @@ public final class PriorityMessageQueue extends AbstractMessageQueue {
@Override
protected JmsInboundMessageDispatch removeFirst() {
if (this.size > 0) {
- for (int i = MAX_PRIORITY - 1; i >= 0; i--) {
+ for (int i = MAX_PRIORITY; i >= 0; i--) {
LinkedList<JmsInboundMessageDispatch> list = lists[i];
if (!list.isEmpty()) {
this.size--;
@@ -117,7 +118,7 @@ public final class PriorityMessageQueue extends AbstractMessageQueue {
@Override
protected JmsInboundMessageDispatch peekFirst() {
if (this.size > 0) {
- for (int i = MAX_PRIORITY - 1; i >= 0; i--) {
+ for (int i = MAX_PRIORITY; i >= 0; i--) {
LinkedList<JmsInboundMessageDispatch> list = lists[i];
if (!list.isEmpty()) {
return list.peekFirst();
@@ -134,7 +135,7 @@ public final class PriorityMessageQueue extends AbstractMessageQueue {
priority = Math.max(envelope.getMessage().getJMSPriority(), 0);
} catch (JMSException e) {
}
- priority = Math.min(priority, 9);
+ priority = Math.min(priority, MAX_PRIORITY);
}
return priority;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org