Return-Path: Delivered-To: apmail-geronimo-activemq-commits-archive@www.apache.org Received: (qmail 65201 invoked from network); 9 Feb 2006 11:07:07 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 9 Feb 2006 11:07:07 -0000 Received: (qmail 96424 invoked by uid 500); 9 Feb 2006 11:07:06 -0000 Delivered-To: apmail-geronimo-activemq-commits-archive@geronimo.apache.org Received: (qmail 96402 invoked by uid 500); 9 Feb 2006 11:07:05 -0000 Mailing-List: contact activemq-commits-help@geronimo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: activemq-dev@geronimo.apache.org Delivered-To: mailing list activemq-commits@geronimo.apache.org Received: (qmail 96393 invoked by uid 99); 9 Feb 2006 11:07:05 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 09 Feb 2006 03:07:05 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Thu, 09 Feb 2006 03:07:05 -0800 Received: (qmail 64928 invoked by uid 65534); 9 Feb 2006 11:06:44 -0000 Message-ID: <20060209110644.64927.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r376260 - /incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/RegionBroker.java Date: Thu, 09 Feb 2006 11:06:43 -0000 To: activemq-commits@geronimo.apache.org From: rajdavies@apache.org X-Mailer: svnmailer-1.0.6 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: rajdavies Date: Thu Feb 9 03:06:41 2006 New Revision: 376260 URL: http://svn.apache.org/viewcvs?rev=376260&view=rev Log: Set timestamp on the broker Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/RegionBroker.java Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/RegionBroker.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/RegionBroker.java?rev=376260&r1=376259&r2=376260&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/RegionBroker.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/RegionBroker.java Thu Feb 9 03:06:41 2006 @@ -296,6 +296,10 @@ public void send(ConnectionContext context, Message message) throws Throwable { message.getMessageId().setBrokerSequenceId(sequenceGenerator.getNextSequenceId()); + if (message.getTimestamp() > 0 && (message.getBrokerPath() == null | message.getBrokerPath().length == 0)) { + //timestamp not been disabled and has not passed through a network + message.setTimestamp(System.currentTimeMillis()); + } ActiveMQDestination destination = message.getDestination(); switch(destination.getDestinationType()) { case ActiveMQDestination.QUEUE_TYPE: