You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2014/08/15 00:53:31 UTC

svn commit: r1618079 - /qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/UnacknowledgedMessageMapImpl.java

Author: rgodfrey
Date: Thu Aug 14 22:53:31 2014
New Revision: 1618079

URL: http://svn.apache.org/r1618079
Log:
QPID-3978 : [Java Broker] Fix bug in unacknowledged map where non locked (deleted) messages were not being excluded from the messages to dequeue

Modified:
    qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/UnacknowledgedMessageMapImpl.java

Modified: qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/UnacknowledgedMessageMapImpl.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/UnacknowledgedMessageMapImpl.java?rev=1618079&r1=1618078&r2=1618079&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/UnacknowledgedMessageMapImpl.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/UnacknowledgedMessageMapImpl.java Thu Aug 14 22:53:31 2014
@@ -158,7 +158,7 @@ public class UnacknowledgedMessageMapImp
                 acknowledged.add(instance);
             }
         }
-        return ackedMessageMap.values();
+        return acknowledged;
     }
 
     private void collect(long key, Map<Long, MessageInstance> msgs)



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org