Repository: activemq-6 Updated Branches: refs/heads/master 475f2322e -> f99a018a2
revert fix that was ported by accident Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/08185875 Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/08185875 Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/08185875 Branch: refs/heads/master Commit: 0818587597d0d7c55a2a335d126e9dabfb1bd234 Parents: 475f232 Author: Andy Taylor <[email protected]> Authored: Fri Jan 16 10:08:37 2015 +0000 Committer: Andy Taylor <[email protected]> Committed: Fri Jan 16 10:08:37 2015 +0000 ---------------------------------------------------------------------- .../activemq/server/ActiveMQBootstrap.java | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-6/blob/08185875/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 daf6a4b..ba0d63f 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 @@ -243,20 +243,12 @@ public class ActiveMQBootstrap { try { - if (!spawned) - { - manager.getActiveMQServer() - .stop(true); - manager.stop(); - manager = null; - server = null; - killFile.delete(); - } - else - { - killFile.delete(); - Runtime.getRuntime().halt(777); - } + manager.getActiveMQServer() + .stop(true); + manager.stop(); + manager = null; + server = null; + killFile.delete(); } catch (Exception e) {
