From 6a4b3433c684b16e7a1cca7efadfea81ef3316e5 Mon Sep 17 00:00:00 2001 From: Andy Taylor Date: Thu, 26 Feb 2015 11:32:28 +0000 Subject: [PATCH] fix start and stop boorstrap classes --- .../src/main/java/org/apache/activemq/cli/commands/Run.java | 5 ++++- .../src/main/java/org/apache/activemq/cli/commands/Stop.java | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/activemq-bootstrap/src/main/java/org/apache/activemq/cli/commands/Run.java b/activemq-bootstrap/src/main/java/org/apache/activemq/cli/commands/Run.java index 9df46c0a9c..d898bfea8d 100644 --- a/activemq-bootstrap/src/main/java/org/apache/activemq/cli/commands/Run.java +++ b/activemq-bootstrap/src/main/java/org/apache/activemq/cli/commands/Run.java @@ -31,6 +31,7 @@ import org.apache.activemq.integration.bootstrap.ActiveMQBootstrapLogger; import org.apache.activemq.spi.core.security.ActiveMQSecurityManager; import java.io.File; +import java.net.URI; import java.util.ArrayList; import java.util.Timer; import java.util.TimerTask; @@ -62,7 +63,9 @@ public class Run implements Action BrokerDTO broker = BrokerFactory.createBrokerConfiguration(configuration); - addShutdownHook(new File(broker.server.configuration).getParentFile()); + String fileName = new URI(broker.server.configuration).getSchemeSpecificPart(); + + addShutdownHook(new File(fileName).getParentFile()); ActiveMQSecurityManager security = SecurityManagerFactory.create(broker.security); diff --git a/activemq-bootstrap/src/main/java/org/apache/activemq/cli/commands/Stop.java b/activemq-bootstrap/src/main/java/org/apache/activemq/cli/commands/Stop.java index e0fdc4b6ca..da92f483eb 100644 --- a/activemq-bootstrap/src/main/java/org/apache/activemq/cli/commands/Stop.java +++ b/activemq-bootstrap/src/main/java/org/apache/activemq/cli/commands/Stop.java @@ -22,6 +22,7 @@ import org.apache.activemq.dto.BrokerDTO; import org.apache.activemq.factory.BrokerFactory; import java.io.File; +import java.net.URI; @Command(name = "stop", description = "stops the broker instance") public class Stop implements Action @@ -38,7 +39,9 @@ public class Stop implements Action } BrokerDTO broker = BrokerFactory.createBrokerConfiguration(configuration); - File file = new File(broker.server.configuration).getParentFile(); + String fileName = new URI(broker.server.configuration).getSchemeSpecificPart(); + + File file = new File(fileName).getParentFile(); File stopFile = new File(file, "STOP_ME");