diff options
| author | Aidan Skinner <aidan@apache.org> | 2008-09-19 15:20:05 +0000 |
|---|---|---|
| committer | Aidan Skinner <aidan@apache.org> | 2008-09-19 15:20:05 +0000 |
| commit | 9954f70ce1a3982d9a54c1da0e4050d4c8ebde70 (patch) | |
| tree | d57c245b0b28c30678c3c8824eead1f64c9f8fdc /java/broker/src/main | |
| parent | 7afcca6c7f08224ad5c7b44d8215f4c68c08dd65 (diff) | |
| download | qpid-python-9954f70ce1a3982d9a54c1da0e4050d4c8ebde70.tar.gz | |
QPID-1286: Change test and variable names as per review.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@697130 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/broker/src/main')
| -rw-r--r-- | java/broker/src/main/java/org/apache/qpid/server/queue/AMQPriorityQueue.java | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/java/broker/src/main/java/org/apache/qpid/server/queue/AMQPriorityQueue.java b/java/broker/src/main/java/org/apache/qpid/server/queue/AMQPriorityQueue.java index d7aef34a10..34a70c6969 100644 --- a/java/broker/src/main/java/org/apache/qpid/server/queue/AMQPriorityQueue.java +++ b/java/broker/src/main/java/org/apache/qpid/server/queue/AMQPriorityQueue.java @@ -52,12 +52,8 @@ public class AMQPriorityQueue extends SimpleAMQQueue while(subIter.advance() && !entry.isAcquired()) { final Subscription subscription = subIter.getNode().getSubscription(); - if (subIter.getNode().isDeleted()) - { - continue; - } QueueEntry subnode = subscription.getLastSeenEntry(); - while(entry.compareTo(subnode) < 0 && !entry.isAcquired()) + while(subnode != null && entry.compareTo(subnode) < 0 && !entry.isAcquired()) { if(subscription.setLastSeenEntry(subnode,entry)) { |