FORGE-661

forge · Aug 31, 2012 · c629895 · c629895
1 parent 13bd298
commit c629895
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/shell/src/main/java/org/jboss/forge/shell/ShellImpl.java b/shell/src/main/java/org/jboss/forge/shell/ShellImpl.java
@@ -660,15 +660,15 @@ private void handleException(final Exception original) throws Exception
       {
          // unwrap any aborted exceptions
          Throwable cause = original;
-         while (cause != null)
+         while (cause.getCause() != null)
          {
             if (cause instanceof AbortedException)
                throw (AbortedException) cause;
 
             cause = cause.getCause();
          }
 
-         throw original;
+         throw cause;
       }
       catch (AbortedException e)
       {
@@ -710,7 +710,7 @@ private void handleException(final Exception original) throws Exception
             e.printStackTrace();
          }
       }
-      catch (Exception e)
+      catch (Throwable e)
       {
          if (!isVerbose())
          {

diff --git a/shell/src/test/java/org/jboss/forge/shell/plugins/builtin/RunPluginTest.java b/shell/src/test/java/org/jboss/forge/shell/plugins/builtin/RunPluginTest.java
@@ -22,7 +22,7 @@ public void testRun() throws Exception
    {
       File file = new File("src/test/resources/org/jboss/forge/shell/test/plugins/builtin/RunPluginTest.fsh");
       Assert.assertTrue("Script file does not exist", file.exists());
-      getShell().execute(file);
+      getShell().execute("run "+file.getAbsolutePath());
    }
 
 }