You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2015/08/25 03:36:11 UTC

activemq-artemis git commit: small change on return from Bootstrap

Repository: activemq-artemis
Updated Branches:
  refs/heads/master 436df8afd -> cdc613332


small change on return from Bootstrap

- Embedding clients could eventually need the return from the execute method


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/cdc61333
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/cdc61333
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/cdc61333

Branch: refs/heads/master
Commit: cdc6133327a57d8fcedc74d4d430b386aae8f7ef
Parents: 436df8a
Author: Clebert Suconic <cl...@apache.org>
Authored: Mon Aug 24 21:33:52 2015 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Mon Aug 24 21:35:56 2015 -0400

----------------------------------------------------------------------
 .../src/main/java/org/apache/activemq/artemis/boot/Artemis.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/cdc61333/artemis-boot/src/main/java/org/apache/activemq/artemis/boot/Artemis.java
----------------------------------------------------------------------
diff --git a/artemis-boot/src/main/java/org/apache/activemq/artemis/boot/Artemis.java b/artemis-boot/src/main/java/org/apache/activemq/artemis/boot/Artemis.java
index 114d9a7..f6985db 100644
--- a/artemis-boot/src/main/java/org/apache/activemq/artemis/boot/Artemis.java
+++ b/artemis-boot/src/main/java/org/apache/activemq/artemis/boot/Artemis.java
@@ -52,7 +52,7 @@ public class Artemis {
    }
 
    /** This is a good method for booting an embedded command */
-   public static void execute(File fileHome, File fileInstance, String ... args) throws Throwable {
+   public static Object execute(File fileHome, File fileInstance, String ... args) throws Throwable {
       ArrayList<File> dirs = new ArrayList<File>();
       if (fileHome != null) {
          dirs.add(new File(fileHome, "lib"));
@@ -113,7 +113,7 @@ public class Artemis {
       Class<?> clazz = loader.loadClass("org.apache.activemq.artemis.cli.Artemis");
       Method method = clazz.getMethod("execute", File.class, File.class, args.getClass());
       try {
-         method.invoke(null, fileHome, fileInstance, args);
+         return method.invoke(null, fileHome, fileInstance, args);
       }
       catch (InvocationTargetException e) {
          throw e.getTargetException();