Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 16323 invoked from network); 7 Jul 2008 19:33:57 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 7 Jul 2008 19:33:57 -0000 Received: (qmail 28815 invoked by uid 500); 7 Jul 2008 19:33:58 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 28796 invoked by uid 500); 7 Jul 2008 19:33:58 -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 28786 invoked by uid 99); 7 Jul 2008 19:33:58 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 07 Jul 2008 12:33:58 -0700 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; Mon, 07 Jul 2008 19:33:15 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 0BF1A2388A23; Mon, 7 Jul 2008 12:33:37 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r674607 - /activemq/trunk/activemq-core/src/main/java/org/apache/activemq/thread/Scheduler.java Date: Mon, 07 Jul 2008 19:33:36 -0000 To: commits@activemq.apache.org From: rajdavies@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080707193337.0BF1A2388A23@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rajdavies Date: Mon Jul 7 12:33:36 2008 New Revision: 674607 URL: http://svn.apache.org/viewvc?rev=674607&view=rev Log: Applied patch from https://issues.apache.org/activemq/browse/AMQ-1839 Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/thread/Scheduler.java Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/thread/Scheduler.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/thread/Scheduler.java?rev=674607&r1=674606&r2=674607&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/thread/Scheduler.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/thread/Scheduler.java Mon Jul 7 12:33:36 2008 @@ -51,5 +51,9 @@ TimerTask timerTask = new SchedulerTimerTask(task); CLOCK_DAEMON.schedule(timerTask, redeliveryDelay); } + + public static void shutdown() { + CLOCK_DAEMON.cancel(); + } }