fix for System.exit needs to stop running threads

BobHanson · BobHanson · commit 95d7f3c049cd · 2018-02-08T01:25:32.000-06:00
diff --git a/sources/net.sf.j2s.java.core/src/java/lang/Thread.java b/sources/net.sf.j2s.java.core/src/java/lang/Thread.java
@@ -204,7 +204,7 @@ private static synchronized int nextThreadNum() {
      * Thread ID
      */
     private long tid;
-
+    
     /* For generating thread ID */
     private static long threadSeqNumber;
 		public static Thread thisThread;
@@ -277,7 +277,7 @@ private static synchronized long nextThreadID() {
 		public static Thread currentThread() {
     	/**
     	 * @j2sNative
-    	 *if (java.lang.Thread.thisThread == "working")
+    	 *if (java.lang.Thread.thisThread === "working")
     	 *  return null;
     	 * 
     	 * 
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/JSToolkit.java b/sources/net.sf.j2s.java.core/src/swingjs/JSToolkit.java
@@ -106,7 +106,15 @@ public static Object getPostEventQueue(boolean isPost) {
 				AppContext.EVENT_QUEUE_KEY));
 	}
 
+	/**
+	 * From System.exit()
+	 */
 	public static void exit() {
+		/**
+		 * @j2sNative
+		 * 
+		 * Thread.thisThread.group.systemExited = true;
+		 */
 		JSUtil.getAppletViewer().exit();
 	}
 
@@ -345,6 +353,7 @@ public static void dispatchEvent(AWTEvent event, Object src, boolean andWait) {
 		/**
 		 * @j2sNative
 		 * 
+		 * 
 		 *            f = function()
 		 *            {
 		 *            if
@@ -373,7 +382,9 @@ public static int dispatch(Object f, int msDelay, int id) {
 		/**
 		 * @j2sNative
 		 * 
-		 *            var thread = java.lang.Thread.thisThread;
+		 *            var thread = Thread.thisThread;
+		 *            if (thread.group.systemExited)
+		 *            	return;
 		 *            var thread0 = thread;
 		 *            var id0 = SwingJS.eventID || 0;
 		 *            var ff = function(_JSToolkit_setTimeout) {
@@ -387,9 +398,10 @@ public static int dispatch(Object f, int msDelay, int id) {
 		 *             } catch (e) {
 		 *             var s = "JSToolkit.dispatch(" + id +"): " + e + "\n" + (e.getStackTrace ? e.getStackTrace() + "\n" : "") + (!!e.stack ? e.stack : "");
 		 *             System.out.println(s);
-		 *             alert(s)}
+		 *             alert(s);
+		 *             }
 		 *            SwingJS.eventID = id0; 
-		 *            java.lang.Thread.thisThread = thread0; 
+		 *            Thread.thisThread = thread0; 
 		 *            };
 		 *            return (msDelay == -1 ? ff() : setTimeout(ff, msDelay));
 		 * 
@@ -413,7 +425,9 @@ private static void invokeAndWait(JSFunction f, int id) {
 		/**
 		 * @j2sNative
 		 * 
-		 *            var thread = java.lang.Thread.thisThread;
+		 *            var thread = Thread.thisThread;
+		 *            if (thread.group.systemExited)
+		 *            	return;
 		 *            var thread0 = thread;
 		 *            (function(_JSToolkit_setTimeout) {
 		 *              var id0 = SwingJS.eventID || 0;
@@ -424,7 +438,7 @@ private static void invokeAndWait(JSFunction f, int id) {
 		 *              else
 		 *                f();
 		 *              SwingJS.eventID = id0;
-		 *              java.lang.Thread.thisThread = thread0; 
+		 *              Thread.thisThread = thread0; 
 		 *            })();
 		 * 
 		 * 
