QPID-1497: Ensure policy count and size reflect transactionality of dequeues

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

1 files changed, 2 insertions, 8 deletions

diff --git a/cpp/src/qpid/broker/QueuePolicy.cpp b/cpp/src/qpid/broker/QueuePolicy.cpp
index 6ce94707d5..41a6709d27 100644
--- a/cpp/src/qpid/broker/QueuePolicy.cpp
+++ b/cpp/src/qpid/broker/QueuePolicy.cpp
@@ -46,18 +46,12 @@ void QueuePolicy::dequeued(uint64_t _size)
         if (count.get() > 0) {
             --count;
         } else {
-            //Temporarily disabling checking as it causes java dtx test to fail
-            //TODO: renable these once all tests are passing again
-            //throw Exception(QPID_MSG("Attempted count underflow on dequeue(" << _size << "): " << *this));
-            QPID_LOG(error, "Attempted count underflow on dequeue(" << _size << "): " << *this);
+            throw Exception(QPID_MSG("Attempted count underflow on dequeue(" << _size << "): " << *this));
         }
     }
     if (maxSize) {
         if (_size > size.get()) {
-            //Temporarily disabling checking as it causes java dtx test to fail
-            //TODO: renable these once all tests are passing again
-            //throw Exception(QPID_MSG("Attempted size underflow on dequeue(" << _size << "): " << *this));
-            QPID_LOG(error, "Attempted size underflow on dequeue(" << _size << "): " << *this);
+            throw Exception(QPID_MSG("Attempted size underflow on dequeue(" << _size << "): " << *this));
         } else {
             size -= _size;
         }