From 8d5b78b3c58fde8fdaa599372fd0e646bb386b0b Mon Sep 17 00:00:00 2001
From: Gordon Sim <gsim@apache.org>
Date: Wed, 8 May 2013 18:22:19 +0000
Subject: QPID-3189: correct calculated queue depth if enqueue fails

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1480389 13f79535-47bb-0310-9956-ffa450edef68
---
 cpp/src/qpid/broker/Queue.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'cpp')

diff --git a/cpp/src/qpid/broker/Queue.cpp b/cpp/src/qpid/broker/Queue.cpp
index 4d9a7f2a37..5e806699de 100644
--- a/cpp/src/qpid/broker/Queue.cpp
+++ b/cpp/src/qpid/broker/Queue.cpp
@@ -835,7 +835,12 @@ bool Queue::enqueue(TransactionContext* ctxt, Message& msg)
         boost::intrusive_ptr<PersistableMessage> pmsg = msg.getPersistentContext();
         assert(pmsg);
         pmsg->enqueueAsync(shared_from_this(), store);
-        store->enqueue(ctxt, pmsg, *this);
+        try {
+            store->enqueue(ctxt, pmsg, *this);
+        } catch (...) {
+            enqueueAborted(msg);
+            throw;
+        }
     }
     return true;
 }
-- 
cgit v1.2.1