--- old/test/java/rmi/activation/Activatable/shutdownGracefully/ShutdownGracefully.java	2014-01-26 12:44:07.167658216 +0800
+++ new/test/java/rmi/activation/Activatable/shutdownGracefully/ShutdownGracefully.java	2014-01-26 12:44:06.975658206 +0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,6 +36,7 @@
 import java.rmi.activation.*;
 import java.rmi.*;
 import java.util.Properties;
+import java.util.concurrent.TimeUnit;
 
 /**
  * The test creates an rmid with a special security manager.  After
@@ -142,93 +143,29 @@
                 System.err.println("received exception from registration " +
                                    "call that should have failed...");
             }
-
-            /*
-             * no longer needed because the security manager
-             * throws an exception during snapshot
-             */
-            /*
-            try {
-                registering.shutdown();
-
-                System.err.println("received exception from remote " +
-                                   "call that should have failed...");
-            } catch (RemoteException e) {
-            }
-            */
-
         } catch (Exception e) {
             TestLibrary.bomb("\nfailure: unexpected exception ", e);
         } finally {
-            try {
-                Thread.sleep(4000);
-            } catch (InterruptedException e) {
-            }
-
-            registering = null;
-
-            // Need to make sure that rmid goes away by itself
-            JavaVM rmidProcess = rmid;
-            if (rmidProcess != null) {
+            if(rmid != null) {
                 try {
-                    Runnable waitThread =
-                        new ShutdownDetectThread(rmidProcess);
-
-                    synchronized (waitThread) {
-                        (new Thread(waitThread)).start();
-                        waitThread.wait(SHUTDOWN_TIMEOUT);
-                        System.err.println("rmid has shutdown");
-
-                        if (!rmidDone) {
-                            // ensure that this rmid does not infect
-                            // other tests.
-                            rmidProcess.destroy();
-                            TestLibrary.bomb("rmid did not shutdown " +
-                                             "gracefully in time");
-                        }
+                    boolean hasShutdown = rmid.waitFor(SHUTDOWN_TIMEOUT,
+                            TimeUnit.MILLISECONDS);
+                    if (hasShutdown) {
+                        System.err.println("rmid has gracefully shutdown in time");
+                    } else {
+                        TestLibrary.bomb("rmid did not shutdown " +
+                                     "gracefully in time");
                     }
-                } catch (Exception e) {
-                    TestLibrary.bomb("exception waiting for rmid " +
-                                     "to shut down");
+                } catch (InterruptedException ex) {
+                    TestLibrary.bomb("\nfailure: unexpected exception ", ex);
                 }
             }
-            // else rmid should be down
         }
 
         System.err.println
             ("\nsuccess: ShutdownGracefully test passed ");
     }
 
-    private static boolean rmidDone = false;
-
-    /**
-     * class that waits for rmid to exit
-     */
-    private static class ShutdownDetectThread implements Runnable {
-        private JavaVM rmidProcess = null;
-
-        ShutdownDetectThread(JavaVM rmidProcess) {
-            this.rmidProcess = rmidProcess;
-        }
-        public void run() {
-            System.err.println("waiting for rmid to shutdown");
-
-            try {
-                rmidProcess.waitFor();
-            } catch (InterruptedException e) {
-                // should not happen
-            }
-
-            synchronized (this) {
-                // notify parent thread when rmid has exited
-                this.notify();
-                rmidDone = true;
-            }
-
-            RMID.removeLog();
-        }
-    }
-
     /**
      * implementation of RegisteringActivatable
      */