jdk/test/java/rmi/testlibrary/JavaVM.java

rev 5725 : Merge

*** 131,140 ****
--- 131,148 ----
       */
      protected static String getCodeCoverageOptions() {
          return TestLibrary.getExtraProperty("jcov.options","");
      }
  
+     public void start(Runnable runnable) throws IOException {
+         if (runnable == null) {
+             throw new NullPointerException("Runnable cannot be null.");
+         }
+ 
+         start();
+         new JavaVMCallbackHandler(runnable).start();
+     }
  
      /**
       * Exec the VM as specified in this object's constructor.
       */
      public void start() throws IOException {
*** 233,238 ****
--- 241,277 ----
      }
  
      protected Process getVM() {
          return vm;
      }
+ 
+     /**
+      * Handles calling the callback.
+      */
+     private class JavaVMCallbackHandler extends Thread {
+         Runnable runnable;
+ 
+         JavaVMCallbackHandler(Runnable runnable) {
+             this.runnable = runnable;
+         }
+ 
+ 
+         /**
+          * Wait for the Process to terminate and notify the callback.
+          */
+         @Override
+         public void run() {
+             if (vm != null) {
+                 try {
+                     vm.waitFor();
+                 } catch(InterruptedException ie) {
+                     // Restore the interrupted status
+                     Thread.currentThread().interrupt();
+                 }
+             }
+ 
+             if (runnable != null) {
+                 runnable.run();
+             }
+         }
+     }
  }