commit c1370cebea3c565bb87bd8119b902703680a71a7
author Gordon Sim <gsim@apache.org> Thu Apr 21 22:25:35 2016 +0000
committer Gordon Sim <gsim@apache.org> Thu Apr 21 22:25:35 2016 +0000
tree a47c2f1bf9fe0f703ef5d8d272351acf10ce685b
parent 12b8481e9a306b3adebc01abb0033913f07450c3

QPID-7225: ensure message to be released is acquired

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1740422 13f79535-47bb-0310-9956-ffa450edef68

qpid/cpp/src/qpid/broker/IndexedDeque.h

diff --git a/qpid/cpp/src/qpid/broker/IndexedDeque.h b/qpid/cpp/src/qpid/broker/IndexedDeque.h
index 229b4e3..e13a218 100644
--- a/qpid/cpp/src/qpid/broker/IndexedDeque.h
+++ b/qpid/cpp/src/qpid/broker/IndexedDeque.h
@@ -112,7 +112,7 @@
     T* release(const QueueCursor& cursor)
     {
         size_t i;
-        if (cursor.valid && index(cursor.position, i)) {
+        if (cursor.valid && index(cursor.position, i) && messages[i].getState() == ACQUIRED) {
             messages[i].setState(AVAILABLE);
             ++version;
             QPID_LOG(debug, "Released message at position " << cursor.position << ", index " << i);