--- old/test/java/rmi/activation/Activatable/forceLogSnapshot/ForceLogSnapshot.java	2016-09-27 02:08:04.739761853 -0700
+++ new/test/java/rmi/activation/Activatable/forceLogSnapshot/ForceLogSnapshot.java	2016-09-27 02:08:04.453904848 -0700
@@ -22,7 +22,7 @@
  */
 
 /* @test
- * @bug 4173960
+ * @bug 4173960 8085192
  * @summary synopsis: Activatable objects cannot be restarted.
  * @author Laird Dornin
  *
@@ -37,6 +37,7 @@
  */
 
 import java.io.*;
+import java.net.BindException;
 import java.rmi.*;
 import java.rmi.activation.*;
 import java.rmi.server.*;
@@ -128,10 +129,19 @@
             String option = " -Dsun.rmi.activation.snapshotInterval=" +
                 SNAPSHOT_INTERVAL;
 
-            RMID.removeLog();
-            rmid = RMID.createRMID();
-            rmid.addOptions(new String[] {option, "-Djava.compiler="});
-            rmid.start();
+            for (int i = 0; i < 20; i++) {
+                RMID.removeLog();
+                rmid = RMID.createRMID();
+                rmid.addOptions(new String[] {option, "-Djava.compiler="});
+                try {
+                    rmid.start();
+                    break;
+                } catch (BindException ex) {
+                    System.err.format("%ncatch BindException(%s), "
+                            + "continue to launch rmid again...%n%n", ex.getMessage());
+                    continue;
+                }
+            }
 
             /* Cause activation groups to have a security policy that will
              * allow security managers to be downloaded and installed