Return-Path: X-Original-To: apmail-activemq-commits-archive@www.apache.org Delivered-To: apmail-activemq-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 1B54810931 for ; Mon, 8 Jul 2013 14:22:20 +0000 (UTC) Received: (qmail 27291 invoked by uid 500); 8 Jul 2013 14:22:19 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 27259 invoked by uid 500); 8 Jul 2013 14:22:19 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 27252 invoked by uid 99); 8 Jul 2013 14:22:19 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 08 Jul 2013 14:22:19 +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; Mon, 08 Jul 2013 14:22:18 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id E338C2388B43; Mon, 8 Jul 2013 14:21:43 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1500753 - /activemq/trunk/activemq-client/src/main/java/org/apache/activemq/broker/scheduler/CronParser.java Date: Mon, 08 Jul 2013 14:21:43 -0000 To: commits@activemq.apache.org From: tabish@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20130708142143.E338C2388B43@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: tabish Date: Mon Jul 8 14:21:43 2013 New Revision: 1500753 URL: http://svn.apache.org/r1500753 Log: fix for: https://issues.apache.org/jira/browse/AMQ-4591 Modified: activemq/trunk/activemq-client/src/main/java/org/apache/activemq/broker/scheduler/CronParser.java Modified: activemq/trunk/activemq-client/src/main/java/org/apache/activemq/broker/scheduler/CronParser.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-client/src/main/java/org/apache/activemq/broker/scheduler/CronParser.java?rev=1500753&r1=1500752&r2=1500753&view=diff ============================================================================== --- activemq/trunk/activemq-client/src/main/java/org/apache/activemq/broker/scheduler/CronParser.java (original) +++ activemq/trunk/activemq-client/src/main/java/org/apache/activemq/broker/scheduler/CronParser.java Mon Jul 8 14:21:43 2013 @@ -21,6 +21,7 @@ import java.util.Calendar; import java.util.Collections; import java.util.List; import java.util.StringTokenizer; + import javax.jms.MessageFormatException; public class CronParser { @@ -44,7 +45,7 @@ public class CronParser { // starting the next event at the top of the minute. if (cronEntry.equals("* * * * *")) { result = currentTime + 60 * 1000; - result = result / 1000 * 1000; + result = result / 60000 * 60000; return result; }