Merge pull request #6953 from cbridgha/CopeWNoPS

Tolerate missing ps

Author: cbridgha

dev/com.ibm.ws.kernel.boot.core/src/com/ibm/ws/kernel/boot/internal/FileShareLockProcessStatusImpl.java

@@ -29,20 +29,20 @@ public FileShareLockProcessStatusImpl(File file) {
     }
 
     @Override
-    public boolean isPossiblyRunning() {
+    public ProcessStatus.State isPossiblyRunning() {
         if (file.exists()) {
             try {
                 new FileOutputStream(file, true).close();
             } catch (FileNotFoundException e) {
                 // "java.io.FileNotFoundException: C:\...\logs\console.log
                 // (The process cannot access the file because it is being used
                 // by another process.)"
-                return true;
+                return State.YES;
             } catch (IOException e) {
                 Debug.printStackTrace(e);
             }
         }
 
-        return false;
+        return State.NO;
     }
 }

dev/com.ibm.ws.kernel.boot.core/src/com/ibm/ws/kernel/boot/internal/PSProcessStatusImpl.java

@@ -29,19 +29,19 @@ public class PSProcessStatusImpl implements ProcessStatus {
 
     /**
      * @param pid the pid, or the empty string if {@link #isPossiblyRunning} should
-     *            always return true
+     *                always return true
      */
     public PSProcessStatusImpl(String pid) {
         this.pid = pid;
     }
 
     @Override
-    public boolean isPossiblyRunning() {
+    public State isPossiblyRunning() {
         if (pid.isEmpty()) {
             // OS/400 shell does not support $!, so an empty PID is always
             // passed (unless native integration is enabled).  Return true since
             // the process might be running.
-            return true;
+            return State.YES;
         }
 
         ProcessBuilder pb = new ProcessBuilder();
@@ -68,8 +68,14 @@ public boolean isPossiblyRunning() {
             }
 
             p.waitFor();
-            return p.exitValue() == 0;
+            if (p.exitValue() == 0)
+                return State.YES;
+            else
+                return State.NO;
         } catch (IOException e) {
+            if (e.getMessage().equals("No such file or directory")) // "ps" doesn't exist on this machine.
+                // Return Undetermined since we can't poll the process
+                return State.UNDETERMINED;
             Debug.printStackTrace(e);
         } catch (InterruptedException e) {
             Debug.printStackTrace(e);
@@ -78,6 +84,6 @@ public boolean isPossiblyRunning() {
             Utils.tryToClose(reader);
         }
 
-        return true;
+        return State.YES;
     }
 }

dev/com.ibm.ws.kernel.boot.core/src/com/ibm/ws/kernel/boot/internal/ProcessStatus.java

@@ -14,8 +14,12 @@
  * Monitors the status of a running process.
  */
 public interface ProcessStatus {
+    public enum State {
+        YES, NO, UNDETERMINED
+    }
+
     /**
      * Returns true if the process is possibly running.
      */
-    boolean isPossiblyRunning();
+    State isPossiblyRunning();
 }