From 56830ed4ce02e429fe06181db8f3603e47e48268 Mon Sep 17 00:00:00 2001 From: Robert Gemmell Date: Mon, 12 Sep 2011 13:06:53 +0000 Subject: QPID-3459: Increments delivery counter before transfering message to client in order to count delivery attempts. Applied patch from Oleksandr Rudyy git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1169730 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java | 2 +- .../src/main/java/org/apache/qpid/server/transport/ServerSession.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'qpid/java/broker') diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java index 97f999484f..0b2f0303b0 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java +++ b/qpid/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/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSession.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSession.java index 12ef125b2e..028f6d85be 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSession.java +++ b/qpid/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) -- cgit v1.2.1