test/java/rmi/Naming/UnderscoreHost.java

*** 1,7 ****
   /*
!   * Copyright (c) 2005, 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) 2005, 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.
*** 78,88 ****
      public static void main(String args[]) {
          UnderscoreHost t = null;
          try {
              HostVerifyingSocketFactory hvf = new HostVerifyingSocketFactory();
              RMISocketFactory.setSocketFactory(hvf);
!             Registry r = TestLibrary.createRegistryOnUnusedPort();
              int port = TestLibrary.getRegistryPort(r);
              t = new UnderscoreHost();
              r.rebind(NAME, t);
              Naming.lookup("rmi://" + HOSTNAME +
                            ":" + port + "/" + NAME);
--- 78,88 ----
      public static void main(String args[]) {
          UnderscoreHost t = null;
          try {
              HostVerifyingSocketFactory hvf = new HostVerifyingSocketFactory();
              RMISocketFactory.setSocketFactory(hvf);
!             Registry r = TestLibrary.createRegistryOnEphemeralPort();
              int port = TestLibrary.getRegistryPort(r);
              t = new UnderscoreHost();
              r.rebind(NAME, t);
              Naming.lookup("rmi://" + HOSTNAME +
                            ":" + port + "/" + NAME);