changeset 1244:bfea11f8c8f2

8075604: jjs exits even when non-daemon threads are still active Reviewed-by: attila, jlaskey
author sundar
date Fri, 20 Mar 2015 20:04:18 +0530
parents e024db176497
children c847904b447b
files src/jdk/nashorn/tools/Shell.java
diffstat 1 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/jdk/nashorn/tools/Shell.java	Wed Mar 18 18:21:55 2015 -0700
+++ b/src/jdk/nashorn/tools/Shell.java	Fri Mar 20 20:04:18 2015 +0530
@@ -109,7 +109,10 @@
      */
     public static void main(final String[] args) {
         try {
-            System.exit(main(System.in, System.out, System.err, args));
+            final int exitCode = main(System.in, System.out, System.err, args);
+            if (exitCode != SUCCESS) {
+                System.exit(exitCode);
+            }
         } catch (final IOException e) {
             System.err.println(e); //bootstrapping, Context.err may not exist
             System.exit(IO_ERROR);