test/java/rmi/server/RMISocketFactory/useSocketFactory/registry/UseCustomSocketFactory.java

*** 1,7 ****
  /*
!  * Copyright (c) 1998, 2012, 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
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * Copyright (c) 1998, 2016, 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
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 56,78 ****
          HelloImpl impl = null;
  
          System.out.println("\nRegression test for bug 4148850\n");
  
          TestLibrary.suggestSecurityManager("java.rmi.RMISecurityManager");
!         int registryPort = TestLibrary.getUnusedRandomPort();
  
          try {
              impl = new HelloImpl();
  
              /* Make sure that the rmiregistry can communicate over a
               * custom socket.  Ensure that the functionality exists to
               * allow the rmiregistry to be secure.
               */
              registry = LocateRegistry.
!                 createRegistry(registryPort,
                                 new Compress.CompressRMIClientSocketFactory(),
                                 new Compress.CompressRMIServerSocketFactory());
              registry.rebind("/HelloServer", impl);
              checkStub(registry, "RMIServerSocket");
  
          } catch (Exception e) {
              TestLibrary.bomb("creating registry", e);
--- 56,79 ----
          HelloImpl impl = null;
  
          System.out.println("\nRegression test for bug 4148850\n");
  
          TestLibrary.suggestSecurityManager("java.rmi.RMISecurityManager");
!         int registryPort = -1;
  
          try {
              impl = new HelloImpl();
  
              /* Make sure that the rmiregistry can communicate over a
               * custom socket.  Ensure that the functionality exists to
               * allow the rmiregistry to be secure.
               */
              registry = LocateRegistry.
!                 createRegistry(0,
                                 new Compress.CompressRMIClientSocketFactory(),
                                 new Compress.CompressRMIServerSocketFactory());
+             registryPort = TestLibrary.getRegistryPort(registry);
              registry.rebind("/HelloServer", impl);
              checkStub(registry, "RMIServerSocket");
  
          } catch (Exception e) {
              TestLibrary.bomb("creating registry", e);