Should fix #417 (Exit status was zero on except...

Should fix #417 (Exit status was zero on exceptional exits)

2 files changed, 6 insertions, 0 deletions

diff --git a/src/compiler/scala/tools/nsc/MainGenericRunner.scala b/src/compiler/scala/tools/nsc/MainGenericRunner.scala
index bb10a39325..9cf28af472 100644
--- a/src/compiler/scala/tools/nsc/MainGenericRunner.scala
+++ b/src/compiler/scala/tools/nsc/MainGenericRunner.scala
@@ -162,17 +162,22 @@ object MainGenericRunner {
           } catch {
             case e: ClassNotFoundException =>
               Console.println(e)
+              exit(1)
             case e: NoSuchMethodException =>
               Console.println(e)
+              exit(1)
             case e: InvocationTargetException =>
               e.getCause.printStackTrace
+              exit(1)
           }
+
         } else {
           try {
             ScriptRunner.runScript(settings, thingToRun, command.arguments)
           } catch {
             case e: SecurityException =>
               Console.println(e)
+              exit(1)
           }
         }
     }
diff --git a/src/compiler/scala/tools/nsc/ScriptRunner.scala b/src/compiler/scala/tools/nsc/ScriptRunner.scala
index 10531a1bf5..78a63b2b23 100644
--- a/src/compiler/scala/tools/nsc/ScriptRunner.scala
+++ b/src/compiler/scala/tools/nsc/ScriptRunner.scala
@@ -374,6 +374,7 @@ object ScriptRunner {
     } catch {
       case e:InvocationTargetException =>
         e.getCause.printStackTrace
+        exit(1)
     }
   }