summaryrefslogtreecommitdiff
path: root/qpid/java
diff options
context:
space:
mode:
authorRobert Godfrey <rgodfrey@apache.org>2014-08-14 22:53:31 +0000
committerRobert Godfrey <rgodfrey@apache.org>2014-08-14 22:53:31 +0000
commitdb9a8bb76f08690309da387f9ebdf665c459465f (patch)
tree2bb9b01fa369b411c9127549d20d79b5c9fb7c6d /qpid/java
parentc8b64a9c6739c1015d3d99d6901d216f35a6a367 (diff)
downloadqpid-python-db9a8bb76f08690309da387f9ebdf665c459465f.tar.gz
QPID-3978 : [Java Broker] Fix bug in unacknowledged map where non locked (deleted) messages were not being excluded from the messages to dequeue
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1618079 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java')
-rw-r--r--qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/UnacknowledgedMessageMapImpl.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/UnacknowledgedMessageMapImpl.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/UnacknowledgedMessageMapImpl.java
index 1bd9ab079e..c33af48d8e 100644
--- a/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/UnacknowledgedMessageMapImpl.java
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/UnacknowledgedMessageMapImpl.java
@@ -158,7 +158,7 @@ public class UnacknowledgedMessageMapImpl implements UnacknowledgedMessageMap
acknowledged.add(instance);
}
}
- return ackedMessageMap.values();
+ return acknowledged;
}
private void collect(long key, Map<Long, MessageInstance> msgs)