diff options
| -rw-r--r-- | java/broker/src/main/java/org/apache/qpid/server/queue/ConcurrentSelectorDeliveryManager.java | 2 | ||||
| -rw-r--r-- | java/client/src/main/java/org/apache/qpid/client/AMQSession.java | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/java/broker/src/main/java/org/apache/qpid/server/queue/ConcurrentSelectorDeliveryManager.java b/java/broker/src/main/java/org/apache/qpid/server/queue/ConcurrentSelectorDeliveryManager.java index bb0022ab4d..428418fee9 100644 --- a/java/broker/src/main/java/org/apache/qpid/server/queue/ConcurrentSelectorDeliveryManager.java +++ b/java/broker/src/main/java/org/apache/qpid/server/queue/ConcurrentSelectorDeliveryManager.java @@ -224,6 +224,8 @@ public class ConcurrentSelectorDeliveryManager implements DeliveryManager AMQMessage msg = iter.next(); if(msg.expired(_queue)) { + // fixme: Currently we have to update the total byte size here for the data in the queue + _totalMessageSize.addAndGet(-msg.getSize()); _queue.dequeue(_reapingStoreContext,msg); msg.decrementReference(_reapingStoreContext); iter.remove(); diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQSession.java b/java/client/src/main/java/org/apache/qpid/client/AMQSession.java index 91df4f7d35..4277518f60 100644 --- a/java/client/src/main/java/org/apache/qpid/client/AMQSession.java +++ b/java/client/src/main/java/org/apache/qpid/client/AMQSession.java @@ -2136,7 +2136,6 @@ public class AMQSession extends Closeable implements Session, QueueSession, Topi amqd.getAMQQueueName(), // queue getTicket()); // ticket QueueDeclareOkHandler okHandler = new QueueDeclareOkHandler(); - //getProtocolHandler().syncWrite(queueDeclare, QueueDeclareOkBody.class); getProtocolHandler().writeCommandFrameAndWaitForReply(queueDeclare, okHandler); return okHandler._messageCount; |