Author: clebert.suconic(a)jboss.com
Date: 2011-01-29 23:30:06 -0500 (Sat, 29 Jan 2011)
New Revision: 10161
Modified:
branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/impl/QueueImpl.java
branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/client/PagingOrderTest.java
Log:
tweak on page counters for putnam
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-30
04:02:14 UTC (rev 10160)
+++
branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/impl/QueueImpl.java 2011-01-30
04:30:06 UTC (rev 10161)
@@ -819,7 +819,14 @@
synchronized (this)
{
- return messagesAdded;
+ if (pageSubscription != null)
+ {
+ return messagesAdded + pageSubscription.getCounter().getValue();
+ }
+ else
+ {
+ return messagesAdded;
+ }
}
}
Modified:
branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/client/PagingOrderTest.java
===================================================================
---
branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/client/PagingOrderTest.java 2011-01-30
04:02:14 UTC (rev 10160)
+++
branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/client/PagingOrderTest.java 2011-01-30
04:30:06 UTC (rev 10161)
@@ -363,7 +363,9 @@
assertEquals(0, errors.get());
assertEquals(numberOfMessages, q2.getMessageCount());
+ assertEquals(numberOfMessages, q2.getMessagesAdded());
assertEquals(0, q1.getMessageCount());
+ assertEquals(numberOfMessages, q1.getMessagesAdded());
session.close();
sf.close();
@@ -400,7 +402,10 @@
assertNotNull(q2);
assertEquals(numberOfMessages, q2.getMessageCount());
+ assertEquals(numberOfMessages, q2.getMessagesAdded());
assertEquals(0, q1.getMessageCount());
+ // 0, since nothing was sent to the queue after the server was restarted
+ assertEquals(0, q1.getMessagesAdded());
}
catch (Throwable e)
@@ -520,8 +525,6 @@
session.commit();
- q1.getMessageCount();
-
t1.start();
t1.join();
@@ -534,7 +537,9 @@
}
assertEquals(numberOfMessages, q2.getMessageCount());
+ assertEquals(numberOfMessages, q2.getMessagesAdded());
assertEquals(numberOfMessages - 100, q1.getMessageCount());
+ assertEquals(numberOfMessages, q2.getMessagesAdded());
}
catch (Throwable e)