svn commit: r511919 - in /incubator/qpid/branches/perftesting/qpid/java/broker/src/main/java/org/apache/qpid/server: AMQChannel.java queue/AMQQueue.java

[bhupendrab]

Author: bhupendrab
Date: Mon Feb 26 09:42:16 2007
New Revision: 511919

URL: http://svn.apache.org/viewvc?view=rev&rev=511919
Log:
Message being redelivered to the queue shouldn't cause ReceivedMessageCount to 
increase

Modified:
    
incubator/qpid/branches/perftesting/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
    
incubator/qpid/branches/perftesting/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueue.java

Modified: 
incubator/qpid/branches/perftesting/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
URL: 
http://svn.apache.org/viewvc/incubator/qpid/branches/perftesting/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java?view=diff&rev=511919&r1=511918&r2=511919
==============================================================================
--- 
incubator/qpid/branches/perftesting/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
 (original)
+++ 
incubator/qpid/branches/perftesting/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
 Mon Feb 26 09:42:16 2007
@@ -420,7 +420,7 @@
                 unacked.message.setTxnBuffer(null);
 
                 unacked.message.release();
-
+                unacked.message.setRedelivered(true);
                 unacked.queue.deliver(unacked.message);
             }
         }
@@ -479,7 +479,7 @@
                     unacked.message.setTxnBuffer(null);
 
                     unacked.message.release();
-
+                    unacked.message.setRedelivered(true);
                     unacked.queue.deliver(unacked.message);
                 }
             }

Modified: 
incubator/qpid/branches/perftesting/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueue.java
URL: 
http://svn.apache.org/viewvc/incubator/qpid/branches/perftesting/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueue.java?view=diff&rev=511919&r1=511918&r2=511919
==============================================================================
--- 
incubator/qpid/branches/perftesting/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueue.java
 (original)
+++ 
incubator/qpid/branches/perftesting/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueue.java
 Mon Feb 26 09:42:16 2007
@@ -505,6 +505,9 @@
 
     protected void updateReceivedMessageCount(AMQMessage msg)
     {
+        if (msg.isRedelivered())
+            return;
+
         _totalMessagesReceived++;
         _managedObject.checkForNotification(msg);
     }