diff options
| author | Gordon Sim <gsim@apache.org> | 2013-05-08 18:22:19 +0000 |
|---|---|---|
| committer | Gordon Sim <gsim@apache.org> | 2013-05-08 18:22:19 +0000 |
| commit | f78b3f38a2866fe01cefed32a16eda1b5c8b6375 (patch) | |
| tree | 1ea8747692e90b918a93c458afb080c2518da6bd /qpid/cpp/src | |
| parent | 8a6b211f04fd1efdd6c427656239872ce57735d1 (diff) | |
| download | qpid-python-f78b3f38a2866fe01cefed32a16eda1b5c8b6375.tar.gz | |
QPID-3189: correct calculated queue depth if enqueue fails
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1480389 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src')
| -rw-r--r-- | qpid/cpp/src/qpid/broker/Queue.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/qpid/cpp/src/qpid/broker/Queue.cpp b/qpid/cpp/src/qpid/broker/Queue.cpp index 4d9a7f2a37..5e806699de 100644 --- a/qpid/cpp/src/qpid/broker/Queue.cpp +++ b/qpid/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; } |