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 41BA917F5C for ; Wed, 14 Jan 2015 12:08:48 +0000 (UTC) Received: (qmail 31870 invoked by uid 500); 14 Jan 2015 12:08:50 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 31825 invoked by uid 500); 14 Jan 2015 12:08:50 -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 31815 invoked by uid 99); 14 Jan 2015 12:08:49 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 14 Jan 2015 12:08:49 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 9B538A412C6; Wed, 14 Jan 2015 12:08:49 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: martyntaylor@apache.org To: commits@activemq.apache.org Date: Wed, 14 Jan 2015 12:08:49 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/4] activemq-6 git commit: fix maven plugin to wait until stop thread has been called by making thread non deamon Repository: activemq-6 Updated Branches: refs/heads/master c98937c08 -> 260f579c1 fix maven plugin to wait until stop thread has been called by making thread non deamon Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/5595e0a9 Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/5595e0a9 Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/5595e0a9 Branch: refs/heads/master Commit: 5595e0a9fc2ef613beede95676b85417bbdf379d Parents: 41fed21 Author: Andy Taylor Authored: Tue Jan 13 15:07:41 2015 +0000 Committer: Andy Taylor Committed: Wed Jan 14 09:09:58 2015 +0000 ---------------------------------------------------------------------- .../main/java/org/apache/activemq/server/ActiveMQBootstrap.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-6/blob/5595e0a9/activemq-maven-plugin/src/main/java/org/apache/activemq/server/ActiveMQBootstrap.java ---------------------------------------------------------------------- diff --git a/activemq-maven-plugin/src/main/java/org/apache/activemq/server/ActiveMQBootstrap.java b/activemq-maven-plugin/src/main/java/org/apache/activemq/server/ActiveMQBootstrap.java index 49b16c8..ae7ecfb 100644 --- a/activemq-maven-plugin/src/main/java/org/apache/activemq/server/ActiveMQBootstrap.java +++ b/activemq-maven-plugin/src/main/java/org/apache/activemq/server/ActiveMQBootstrap.java @@ -135,7 +135,7 @@ public class ActiveMQBootstrap { restartFile.delete(); } - final Timer timer = new Timer("ActiveMQ Server Shutdown Timer", true); + final Timer timer = new Timer("ActiveMQ Server Shutdown Timer", false); timer.scheduleAtFixedRate(new ServerStopTimerTask(stopFile, killFile, restartFile, timer), 500, 500); } }