svn commit: r609961 - in /incubator/qpid/branches/M2/java: broker/src/main/java/org/apache/qpid/server/queue/ConcurrentSelectorDeliveryManager.java client/src/main/java/org/apache/qpid/client/AMQSession.java

[ritchiem]

Author: ritchiem
Date: Tue Jan  8 04:59:01 2008
New Revision: 609961

URL: http://svn.apache.org/viewvc?rev=609961&view=rev
Log:
QPID-499 : Patch to update the queue size statistics when the Active TTL 
process runs 
Removed old single commented out code line from AMQSession.

Modified:
    
incubator/qpid/branches/M2/java/broker/src/main/java/org/apache/qpid/server/queue/ConcurrentSelectorDeliveryManager.java
    
incubator/qpid/branches/M2/java/client/src/main/java/org/apache/qpid/client/AMQSession.java

Modified: 
incubator/qpid/branches/M2/java/broker/src/main/java/org/apache/qpid/server/queue/ConcurrentSelectorDeliveryManager.java
URL: 
http://svn.apache.org/viewvc/incubator/qpid/branches/M2/java/broker/src/main/java/org/apache/qpid/server/queue/ConcurrentSelectorDeliveryManager.java?rev=609961&r1=609960&r2=609961&view=diff
==============================================================================
--- 
incubator/qpid/branches/M2/java/broker/src/main/java/org/apache/qpid/server/queue/ConcurrentSelectorDeliveryManager.java
 (original)
+++ 
incubator/qpid/branches/M2/java/broker/src/main/java/org/apache/qpid/server/queue/ConcurrentSelectorDeliveryManager.java
 Tue Jan  8 04:59:01 2008
@@ -224,6 +224,8 @@
             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();

Modified: 
incubator/qpid/branches/M2/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
URL: 
http://svn.apache.org/viewvc/incubator/qpid/branches/M2/java/client/src/main/java/org/apache/qpid/client/AMQSession.java?rev=609961&r1=609960&r2=609961&view=diff
==============================================================================
--- 
incubator/qpid/branches/M2/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
 (original)
+++ 
incubator/qpid/branches/M2/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
 Tue Jan  8 04:59:01 2008
@@ -2136,7 +2136,6 @@
                                                                 
amqd.getAMQQueueName(), // queue
                                                                 getTicket()); 
// ticket
                         QueueDeclareOkHandler okHandler = new 
QueueDeclareOkHandler();
-                        //getProtocolHandler().syncWrite(queueDeclare, 
QueueDeclareOkBody.class);
                         
getProtocolHandler().writeCommandFrameAndWaitForReply(queueDeclare, okHandler);
 
                         return okHandler._messageCount;