From a6f06a587caf9ae9a08b0c01f89ecce9bb0652d3 Mon Sep 17 00:00:00 2001 From: Bhupendra Bhusman Bhardwaj Date: Mon, 26 Feb 2007 17:42:16 +0000 Subject: Message being redelivered to the queue shouldn't cause ReceivedMessageCount to increase git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/perftesting@511919 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java | 4 ++-- .../broker/src/main/java/org/apache/qpid/server/queue/AMQQueue.java | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'qpid/java') 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 90ab71f703..f7dfd92ff1 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 @@ -420,7 +420,7 @@ public class AMQChannel unacked.message.setTxnBuffer(null); unacked.message.release(); - + unacked.message.setRedelivered(true); unacked.queue.deliver(unacked.message); } } @@ -479,7 +479,7 @@ public class AMQChannel unacked.message.setTxnBuffer(null); unacked.message.release(); - + unacked.message.setRedelivered(true); unacked.queue.deliver(unacked.message); } } diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueue.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueue.java index e6882906ff..1e53ae65ab 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueue.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueue.java @@ -505,6 +505,9 @@ public class AMQQueue implements Managable, Comparable protected void updateReceivedMessageCount(AMQMessage msg) { + if (msg.isRedelivered()) + return; + _totalMessagesReceived++; _managedObject.checkForNotification(msg); } -- cgit v1.2.1