Author: clebert.suconic(a)jboss.com
Date: 2011-01-24 21:19:47 -0500 (Mon, 24 Jan 2011)
New Revision: 10139
Modified:
branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/impl/QueueImpl.java
Log:
HORNETQ-628 - fix for paging counters
Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/impl/QueueImpl.java
===================================================================
---
branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/impl/QueueImpl.java 2011-01-25
02:03:08 UTC (rev 10138)
+++
branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/impl/QueueImpl.java 2011-01-25
02:19:47 UTC (rev 10139)
@@ -662,11 +662,11 @@
{
if (pageSubscription != null)
{
- return messageReferences.size() + getScheduledCount() +
pageSubscription.getMessageCount();
+ return messageReferences.size() + getScheduledCount() +
deliveringCount.get() + pageSubscription.getMessageCount();
}
else
{
- return messageReferences.size() + getScheduledCount();
+ return messageReferences.size() + getScheduledCount() +
deliveringCount.get();
}
}
}
@@ -691,6 +691,7 @@
if (ref.isPaged())
{
pageSubscription.ack((PagedReference)ref);
+ postAcknowledge(ref);
}
else
{
@@ -1678,7 +1679,7 @@
boolean durableRef = message.isDurable() && queue.durable;
- if (durableRef)
+ if (durableRef && ! ref.isPaged())
{
int count = message.decrementDurableRefCount();
Show replies by date