don't show "shutdown(0)" twice

BobHanson · BobHanson · commit 95cdbb2d278c · 2019-11-26T23:18:57.000-06:00
diff --git a/sources/net.sf.j2s.java.core/src/java/lang/Runtime.java b/sources/net.sf.j2s.java.core/src/java/lang/Runtime.java
@@ -245,41 +245,41 @@ public boolean removeShutdownHook(Thread hook) {
         return ApplicationShutdownHooks.remove(hook);
     }
 
-    /**
-     * Forcibly terminates the currently running Java virtual machine.  This
-     * method never returns normally.
-     *
-     * <p> This method should be used with extreme caution.  Unlike the
-     * <tt>{@link #exit exit}</tt> method, this method does not cause shutdown
-     * hooks to be started and does not run uninvoked finalizers if
-     * finalization-on-exit has been enabled.  If the shutdown sequence has
-     * already been initiated then this method does not wait for any running
-     * shutdown hooks or finalizers to finish their work. <p>
-     *
-     * @param  status
-     *         Termination status.  By convention, a nonzero status code
-     *         indicates abnormal termination.  If the <tt>{@link Runtime#exit
-     *         exit}</tt> (equivalently, <tt>{@link System#exit(int)
-     *         System.exit}</tt>) method has already been invoked then this
-     *         status code will override the status code passed to that method.
-     *
-     * @throws SecurityException
-     *         If a security manager is present and its <tt>{@link
-     *         SecurityManager#checkExit checkExit}</tt> method does not permit
-     *         an exit with the specified status
-     *
-     * @see #exit
-     * @see #addShutdownHook
-     * @see #removeShutdownHook
-     * @since 1.3
-     */
-    public void halt(int status) {
-        SecurityManager sm = System.getSecurityManager();
-        if (sm != null) {
-            sm.checkExit(status);
-        }
-        Shutdown.halt(status);
-    }
+	/**
+	 * Forcibly terminates the currently running Java virtual machine. This method
+	 * never returns normally.
+	 *
+	 * <p>
+	 * This method should be used with extreme caution. Unlike the
+	 * <tt>{@link #exit exit}</tt> method, this method does not cause shutdown hooks
+	 * to be started and does not run uninvoked finalizers if finalization-on-exit
+	 * has been enabled. If the shutdown sequence has already been initiated then
+	 * this method does not wait for any running shutdown hooks or finalizers to
+	 * finish their work.
+	 * <p>
+	 *
+	 * @param status Termination status. By convention, a nonzero status code
+	 *               indicates abnormal termination. If the <tt>{@link Runtime#exit
+	 *         exit}</tt> (equivalently, <tt>{@link System#exit(int)
+	 *         System.exit}</tt>) method has already been invoked then this status
+	 *               code will override the status code passed to that method.
+	 *
+	 * @throws SecurityException If a security manager is present and its <tt>{@link
+	 *         SecurityManager#checkExit checkExit}</tt> method does not permit an
+	 *                           exit with the specified status
+	 *
+	 * @see #exit
+	 * @see #addShutdownHook
+	 * @see #removeShutdownHook
+	 * @since 1.3
+	 */
+	public void halt(int status) {
+		SecurityManager sm = System.getSecurityManager();
+		if (sm != null) {
+			sm.checkExit(status);
+		}
+		Shutdown.halt(status);
+	}
 
     /**
      * Enable or disable finalization on exit; doing so specifies that the
diff --git a/sources/net.sf.j2s.java.core/src/java/lang/Shutdown.java b/sources/net.sf.j2s.java.core/src/java/lang/Shutdown.java
@@ -67,6 +67,7 @@ class Shutdown {
 
     /* Lock object for the native halt method */
     private static Object haltLock = null;//new Lock();
+	private static boolean 秘isHalted;
 
     /* Invoked by Runtime.runFinalizersOnExit */
     static void setRunFinalizersOnExit(boolean run) {
@@ -158,16 +159,20 @@ private static void runHooks() {
 		}
 	}
 
-    /* The halt method is synchronized on the halt lock
-     * to avoid corruption of the delete-on-shutdown file list.
-     * It invokes the true native halt method.
-     */
-    static void halt(int status) {
-        synchronized (haltLock) {
-        	System.out.println("Shutdown(" + status + ") on " + Thread.currentThread().getThreadGroup().getName());
+	/*
+	 * The halt method is synchronized on the halt lock to avoid corruption of the
+	 * delete-on-shutdown file list. It invokes the true native halt method.
+	 */
+	static void halt(int status) {
+		synchronized (haltLock) {
+
+			if (!秘isHalted) {
+				秘isHalted = true;
+				System.out.println("Shutdown(" + status + ") on " + Thread.currentThread().getThreadGroup().getName());
 //            halt0(status);
-        }
-    }
+			}
+		}
+	}
 
 //    static native void halt0(int status);
 
