--- a/jdk/test/java/rmi/testlibrary/RMID.java Fri May 11 12:53:03 2012 -0700
+++ b/jdk/test/java/rmi/testlibrary/RMID.java Fri May 11 14:13:29 2012 -0700
@@ -218,20 +218,30 @@
} catch (NumberFormatException ignore) {}
waitTime = waitTime * slopFactor;
- // give rmid time to come up
+ // We check several times (as many as provides passed waitTime) to
+ // see if Rmid is currently running. Waiting steps last 100 msecs.
+ final long rmidStartSleepTime = 100;
do {
+ // Sleeping for another rmidStartSleepTime time slice.
try {
- Thread.sleep(Math.min(waitTime, 10000));
+ Thread.sleep(Math.min(waitTime, rmidStartSleepTime));
} catch (InterruptedException ie) {
Thread.currentThread().interrupt();
+ mesg("Thread interrupted while checking for start of Activation System. Giving up check.");
+ mesg("Activation System state unknown");
+ return;
}
- waitTime -= 10000;
+ waitTime -= rmidStartSleepTime;
- // is rmid present?
+ // Checking if rmid is present
if (ActivationLibrary.rmidRunning(port)) {
mesg("finished starting rmid.");
return;
}
+ else {
+ mesg("rmid still not started");
+ }
+
} while (waitTime > 0);
TestLibrary.bomb("start rmid failed... giving up", null);
}
@@ -264,6 +274,8 @@
port +
"/java.rmi.activation.ActivationSystem");
mesg("obtained a reference to the activation system");
+ } catch (RemoteException re) {
+ mesg("could not contact registry while trying to shutdown activation system");
} catch (java.net.MalformedURLException mue) {
}
@@ -272,19 +284,14 @@
}
system.shutdown();
+ } catch (RemoteException re) {
+ mesg("shutting down the activation daemon failed");
} catch (Exception e) {
mesg("caught exception trying to shutdown rmid");
mesg(e.getMessage());
e.printStackTrace();
}
- try {
- // wait for the shutdown to happen
- Thread.sleep(5000);
- } catch (InterruptedException ie) {
- Thread.currentThread().interrupt();
- }
-
mesg("testlibrary finished shutting down rmid");
}
@@ -301,18 +308,47 @@
if (vm != null) {
try {
- // destroy rmid if it is still running...
- try {
- vm.exitValue();
- mesg("rmid exited on shutdown request");
- } catch (IllegalThreadStateException illegal) {
- mesg("Had to destroy RMID's process " +
- "using Process.destroy()");
+ /* Waiting for distant RMID process to shutdown.
+ * Waiting is bounded at a hardcoded max of 60 secs (1 min).
+ * Waiting by steps of 200 msecs, thus at most 300 such attempts
+ * for termination of distant RMID process. If process is not
+ * known to be terminated properly after that time,
+ * we give up for a gracefull termination, and thus go for
+ * forcibly destroying the process.
+ */
+ boolean vmEnded = false;
+ int waitingTrials = 0;
+ final int maxTrials = 300;
+ final long vmProcessEndWaitInterval = 200;
+ int vmExitValue;
+ do {
+ try {
+ Thread.sleep(vmProcessEndWaitInterval);
+ waitingTrials++;
+ vmExitValue = vm.exitValue();
+ mesg("rmid exited on shutdown request");
+ vmEnded = true;
+ } catch (IllegalThreadStateException illegal) {
+ mesg("RMID's process still not terminated after more than " +
+ (waitingTrials * vmProcessEndWaitInterval) + " milliseconds");
+ }
+ }
+ while (!vmEnded &&
+ (waitingTrials < maxTrials));
+
+ if (waitingTrials >= maxTrials) {
+ mesg("RMID's process still not terminated after more than " +
+ (waitingTrials * vmProcessEndWaitInterval) + " milliseconds." +
+ "Givinp up gracefull termination...");
+ mesg("destroying RMID's process using Process.destroy()");
super.destroy();
}
+ } catch (InterruptedException ie) {
+ Thread.currentThread().interrupt();
+ mesg("Thread interrupted while checking for termination of distant rmid vm. Giving up check.");
} catch (Exception e) {
- mesg("caught exception trying to destroy rmid: " +
+ mesg("caught unexpected exception trying to destroy rmid: " +
e.getMessage());
e.printStackTrace();
}