Return-Path: Delivered-To: apmail-qpid-commits-archive@www.apache.org Received: (qmail 25411 invoked from network); 30 Dec 2009 15:49:03 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 30 Dec 2009 15:49:03 -0000 Received: (qmail 87449 invoked by uid 500); 30 Dec 2009 15:49:03 -0000 Delivered-To: apmail-qpid-commits-archive@qpid.apache.org Received: (qmail 87405 invoked by uid 500); 30 Dec 2009 15:49:03 -0000 Mailing-List: contact commits-help@qpid.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@qpid.apache.org Delivered-To: mailing list commits@qpid.apache.org Received: (qmail 87396 invoked by uid 99); 30 Dec 2009 15:49:03 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 30 Dec 2009 15:49:03 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 30 Dec 2009 15:49:01 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 6E5EC2388996; Wed, 30 Dec 2009 15:48:40 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r894652 - /qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java Date: Wed, 30 Dec 2009 15:48:40 -0000 To: commits@qpid.apache.org From: robbie@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091230154840.6E5EC2388996@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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