diff options
| author | Robert Gemmell <robbie@apache.org> | 2011-09-12 13:06:53 +0000 |
|---|---|---|
| committer | Robert Gemmell <robbie@apache.org> | 2011-09-12 13:06:53 +0000 |
| commit | 4e16698cc44b6d8f5709cc75265b129d8947f2e3 (patch) | |
| tree | a1c7a9fd5aa3989fe9308e00a40cfa38d3599ab0 /java | |
| parent | 27cd097cfccb263e80becc8f12d94ebc529752ad (diff) | |
| download | qpid-python-4e16698cc44b6d8f5709cc75265b129d8947f2e3.tar.gz | |
QPID-3459: Increments delivery counter before transfering message to client in order to count delivery attempts.
Applied patch from Oleksandr Rudyy <orudyy@gmail.com>
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1169730 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java')
3 files changed, 3 insertions, 3 deletions
diff --git a/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java b/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java index 97f999484f..0b2f0303b0 100644 --- a/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java +++ b/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java @@ -1055,9 +1055,9 @@ public class AMQChannel implements SessionConfig, AMQSessionModel public void deliverToClient(final Subscription sub, final QueueEntry entry, final long deliveryTag) throws AMQException { + _session.registerMessageDelivered(entry.getMessage().getSize()); getProtocolSession().getProtocolOutputConverter().writeDeliver(entry, getChannelId(), deliveryTag, sub.getConsumerTag()); - _session.registerMessageDelivered(entry.getMessage().getSize()); } }; diff --git a/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSession.java b/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSession.java index 12ef125b2e..028f6d85be 100644 --- a/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSession.java +++ b/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSession.java @@ -200,8 +200,8 @@ public class ServerSession extends Session implements AuthorizationHolder, Sessi public void sendMessage(MessageTransfer xfr, Runnable postIdSettingAction) { - invoke(xfr, postIdSettingAction); getConnectionModel().registerMessageDelivered(xfr.getBodySize()); + invoke(xfr, postIdSettingAction); } public void onMessageDispositionChange(MessageTransfer xfr, MessageDispositionChangeListener acceptListener) diff --git a/java/systests/src/main/java/org/apache/qpid/management/jmx/MessageStatisticsDeliveryTest.java b/java/systests/src/main/java/org/apache/qpid/management/jmx/MessageStatisticsDeliveryTest.java index e657856d0e..c374d23473 100644 --- a/java/systests/src/main/java/org/apache/qpid/management/jmx/MessageStatisticsDeliveryTest.java +++ b/java/systests/src/main/java/org/apache/qpid/management/jmx/MessageStatisticsDeliveryTest.java @@ -103,7 +103,7 @@ public class MessageStatisticsDeliveryTest extends MessageStatisticsTestCase MessageConsumer consumer = session.createConsumer(_queue); for (int i = 0; i < number; i++) { - Message msg = consumer.receive(100); + Message msg = consumer.receive(1000); assertNotNull("Message " + i + " was not received", msg); } } |