test/sun/rmi/runtime/Log/checkLogging/CheckLogging.java

@@ -75,12 +75,13 @@
  *
  * 3. Print directly to return value of RemoteServer.getLog(), verify
  * logger output is non-null.
  */
 public class CheckLogging {
-    private static final String LOCATION =
-        "rmi://localhost:" + TestLibrary.REGISTRY_PORT + "/";
+    private static int REGISTRY_PORT = -1;
+    private static String LOCATION;
+
     private static final ByteArrayOutputStream clientCallOut =
         new ByteArrayOutputStream();
 
     private static final boolean usingOld =
         Boolean.getBoolean("sun.rmi.log.useOld");

@@ -98,11 +99,13 @@
 
     /* use registry to generate client & server call log info */
     private static Registry registry;
     static {
         try {
-            registry = LocateRegistry.createRegistry(TestLibrary.REGISTRY_PORT);
+            registry = TestLibrary.createRegistryOnUnusedPort();
+            REGISTRY_PORT = TestLibrary.getRegistryPort(registry);
+            LOCATION = "rmi://localhost:" + REGISTRY_PORT + "/";
         } catch (Exception e) {
             TestLibrary.bomb("could not create registry");
         }
     }