AS_RESTART renamed to AS_RESTART_PREVIOUS_PID and reviewed processing

Signed-off-by: David Matějček <[email protected]>

Author: dmatej

nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/cli/StartServerHelper.java

@@ -40,7 +40,6 @@
 import org.glassfish.main.jdke.i18n.LocalStringsImpl;
 
 import static com.sun.enterprise.admin.cli.CLIConstants.MASTER_PASSWORD;
-import static com.sun.enterprise.util.StringUtils.ok;
 import static java.lang.System.Logger.Level.DEBUG;
 import static java.lang.System.Logger.Level.INFO;
 import static java.lang.System.Logger.Level.WARNING;
@@ -148,7 +147,7 @@ public void waitForServerStart() throws CommandException {
                 serverName, output);
             return;
         }
-        if (ok(output)) {
+        if (output.isEmpty()) {
             throw new CommandException(I18N.get("serverDiedOutput", serverName, exitCode, output));
         }
         throw new CommandException(I18N.get("serverDied", serverName, exitCode));
@@ -190,8 +189,9 @@ public void report() {
 
 
     /**
-     * If the parent is a GF server -- then wait for it to die. This is part of the Client-Server Restart Dance! THe dying
-     * server called us with the system property AS_RESTART set to its pid
+     * If the parent is a GF server -- then wait for it to die.
+     * This is part of the Client-Server Restart Dance!
+     * The dying server called us with the system property AS_RESTART_PREVIOUS_PID set to its pid
      *
      * @throws CommandException if we timeout waiting for the parent to die or if the admin ports never free up
      */
@@ -211,8 +211,8 @@ private void waitForParentToDie() throws CommandException {
 
 
     private Integer getParentPid() {
-        String pid = System.getProperty("AS_RESTART");
-        if (!ok(pid)) {
+        String pid = System.getProperty("AS_RESTART_PREVIOUS_PID");
+        if (pid == null) {
             return null;
         }
         try {

nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/RestartServer.java

@@ -59,8 +59,6 @@ public class RestartServer {
     private String serverName = "";
 
     private static final LocalStringsImpl strings = new LocalStringsImpl(RestartServer.class);
-    private static final String AS_RESTART_PID = "-DAS_RESTART=" + ProcessHandle.current().pid();
-    private static final String[] normalProps = { AS_RESTART_PID };
     private static final int RESTART_NORMAL = 10;
     private static final int RESTART_DEBUG_ON = 11;
     private static final int RESTART_DEBUG_OFF = 12;
@@ -136,8 +134,9 @@ private void init(AdminCommandContext context) {
 
     private void scheduleReincarnation() throws RDCException {
         try {
+            final String[] sysProps = new String[] {"-DAS_RESTART_PREVIOUS_PID=" + ProcessHandle.current().pid()};
             Runtime.getRuntime()
-                .addShutdownHook(new StartServerShutdownHook(modulepath, classpath, normalProps, classname, args));
+                .addShutdownHook(new StartServerShutdownHook(modulepath, classpath, sysProps, classname, args));
         } catch (Exception e) {
             throw new RDCException(e);
         }