You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2009/12/30 16:48:40 UTC

svn commit: r894652 - /qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java

Author: robbie
Date: Wed Dec 30 15:48:39 2009
New Revision: 894652

URL: http://svn.apache.org/viewvc?rev=894652&view=rev
Log:
QPID-2209: update the move/copy operations to perform the same durability checks as other areas of the broker, to prevent FailedDequeueException when attempting to remove a persistent message that doesnt have an entry in the store

Modified:
    qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java

Modified: qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java?rev=894652&r1=894651&r2=894652&view=diff
==============================================================================
--- qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java (original)
+++ qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java Wed Dec 30 15:48:39 2009
@@ -923,7 +923,7 @@
             {
                 AMQMessage message = entry.getMessage();
 
-                if (message.isPersistent() && toQueue.isDurable())
+                if (message.isPersistent())
                 {
                     store.enqueueMessage(storeContext, toQueue, message.getMessageId());
                 }
@@ -1014,7 +1014,7 @@
             {
                 AMQMessage message = entry.getMessage();
 
-                if (message.isReferenced() && message.isPersistent() && toQueue.isDurable())
+                if (message.isReferenced() && message.isPersistent())
                 {
                     store.enqueueMessage(storeContext, toQueue, message.getMessageId());
                 }



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org