diff --git a/jdk/test/java/rmi/testlibrary/JavaVM.java b/jdk/test/java/rmi/testlibrary/JavaVM.java index a1b169823cd..34680569fbd 100644 --- a/jdk/test/java/rmi/testlibrary/JavaVM.java +++ b/jdk/test/java/rmi/testlibrary/JavaVM.java @@ -59,9 +59,6 @@ public class JavaVM { } } - public JavaVM(String classname) { - this.classname = classname; - } public JavaVM(String classname, String options, String args) { this.classname = classname; @@ -110,15 +107,6 @@ public class JavaVM { 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. */ @@ -176,7 +164,7 @@ public class JavaVM { */ public int waitFor() throws InterruptedException { if (vm == null) - throw new IllegalStateException("can't wait for JavaVM that hasn't started"); + throw new IllegalStateException("can't wait for JavaVM that isn't running"); int status = vm.waitFor(); outPipe.join(); @@ -191,35 +179,4 @@ public class JavaVM { start(); return waitFor(); } - - /** - * 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(); - } - } - } }