Polyglot shell: use AbortException instead of System.exit

maraist · Feb 2, 2018 · 4e3a177 · 4e3a177
1 parent 2c363d8
commit 4e3a177
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/sdk/src/org.graalvm.launcher/src/org/graalvm/launcher/MultiLanguageShell.java b/sdk/src/org.graalvm.launcher/src/org/graalvm/launcher/MultiLanguageShell.java
@@ -95,8 +95,7 @@ public int readEvalPrint() throws IOException {
         }
 
         if (languages.isEmpty()) {
-            console.println("Error: No Graal languages installed. Exiting shell.");
-            System.exit(1);
+            throw new Launcher.AbortException("Error: No Graal languages installed. Exiting shell.", 1);
         }
 
         printUsage(console, promptsString, false);
@@ -108,8 +107,7 @@ public int readEvalPrint() throws IOException {
 
         Language currentLanguage = context.getEngine().getLanguages().get(startLanguage);
         if (currentLanguage == null) {
-            console.println("Error: could not find language '" + startLanguage + "'");
-            System.exit(1);
+            throw new Launcher.AbortException("Error: could not find language '" + startLanguage + "'", 1);
         }
         assert languages.indexOf(currentLanguage) >= 0;
         Source bufferSource = null;