Return-Path: X-Original-To: apmail-qpid-commits-archive@www.apache.org Delivered-To: apmail-qpid-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2D6956042 for ; Fri, 3 Jun 2011 16:05:07 +0000 (UTC) Received: (qmail 32490 invoked by uid 500); 3 Jun 2011 16:05:07 -0000 Delivered-To: apmail-qpid-commits-archive@qpid.apache.org Received: (qmail 32437 invoked by uid 500); 3 Jun 2011 16:05:06 -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 32429 invoked by uid 99); 3 Jun 2011 16:05:06 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 03 Jun 2011 16:05:06 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Fri, 03 Jun 2011 16:05:04 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id AD2672388A29; Fri, 3 Jun 2011 16:04:43 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1131084 - /qpid/trunk/qpid/cpp/src/qpid/broker/Message.cpp Date: Fri, 03 Jun 2011 16:04:43 -0000 To: commits@qpid.apache.org From: gsim@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110603160443.AD2672388A29@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gsim Date: Fri Jun 3 16:04:43 2011 New Revision: 1131084 URL: http://svn.apache.org/viewvc?rev=1131084&view=rev Log: QPID-3291: Applied patch fron Andy Goldstein to ensure that expiration is not lost when adjusting ttl Modified: qpid/trunk/qpid/cpp/src/qpid/broker/Message.cpp Modified: qpid/trunk/qpid/cpp/src/qpid/broker/Message.cpp URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/Message.cpp?rev=1131084&r1=1131083&r2=1131084&view=diff ============================================================================== --- qpid/trunk/qpid/cpp/src/qpid/broker/Message.cpp (original) +++ qpid/trunk/qpid/cpp/src/qpid/broker/Message.cpp Fri Jun 3 16:04:43 2011 @@ -387,7 +387,7 @@ void Message::adjustTtl() sys::Mutex::ScopedLock l(lock); if (expiration < FAR_FUTURE) { sys::Duration d(sys::AbsTime::now(), getExpiration()); - props->setTtl(int64_t(d) > 0 ? int64_t(d)/1000000 : 1); // convert from ns to ms; set to 1 if expired + props->setTtl(int64_t(d) >= 1000000 ? int64_t(d)/1000000 : 1); // convert from ns to ms; set to 1 if expired } } } --------------------------------------------------------------------- Apache Qpid - AMQP Messaging Implementation Project: http://qpid.apache.org Use/Interact: mailto:commits-subscribe@qpid.apache.org