FORGE-2441: Avoiding calling post-hooks if exit is called

forge · Aug 18, 2015 · ce59212 · ce59212
1 parent aa718cf
commit ce59212
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/shell/impl/src/main/java/org/jboss/forge/addon/shell/command/ExitCommand.java b/shell/impl/src/main/java/org/jboss/forge/addon/shell/command/ExitCommand.java
@@ -36,9 +36,11 @@ public void initializeUI(UIBuilder context) throws Exception
    @Override
    public Result execute(UIExecutionContext context) throws Exception
    {
-      Shell shell = (Shell) context.getUIContext().getProvider();
+      UIContext uiContext = context.getUIContext();
+      Shell shell = (Shell) uiContext.getProvider();
       shell.getConsole().stop();
       forge.stop();
+      uiContext.getAttributeMap().put("org.jboss.forge.exit", Boolean.TRUE);
       return Results.success();
    }
 }
diff --git a/...l/src/main/java/org/jboss/forge/addon/ui/impl/controller/SingleCommandControllerImpl.java b/...l/src/main/java/org/jboss/forge/addon/ui/impl/controller/SingleCommandControllerImpl.java
@@ -91,12 +91,15 @@ public Result execute() throws Exception
       try
       {
          Result result = initialCommand.execute(executionContext);
-         firePostCommandExecuted(executionContext, listeners, initialCommand, result);
+         // If exiting, don't do anything
+         if (!Boolean.TRUE.equals(context.getAttributeMap().get("org.jboss.forge.exit")))
+            firePostCommandExecuted(executionContext, listeners, initialCommand, result);
          return result;
       }
       catch (Exception e)
       {
-         firePostCommandFailure(executionContext, listeners, initialCommand, e);
+         if (!Boolean.TRUE.equals(context.getAttributeMap().get("org.jboss.forge.exit")))
+            firePostCommandFailure(executionContext, listeners, initialCommand, e);
          throw e;
       }
    }