2 files changed, 5 insertions, 2 deletions
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);
     }