test/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/EchoImpl.java

*** 62,73 ****
              if (args.length >= 1)
                  protocol = args[0];
  
              System.out.println("EchoServer: creating remote object");
              EchoImpl impl = new EchoImpl(protocol);
              System.out.println("EchoServer: binding in registry");
!             Naming.rebind("//:" + TestLibrary.REGISTRY_PORT +
                            "/EchoServer", impl);
              System.out.println("EchoServer ready.");
          } catch (Exception e) {
              System.err.println("EXCEPTION OCCURRED:");
              e.printStackTrace();
--- 62,74 ----
              if (args.length >= 1)
                  protocol = args[0];
  
              System.out.println("EchoServer: creating remote object");
              EchoImpl impl = new EchoImpl(protocol);
+             int registryPort = new Integer(System.getProperty("rmi.registry.port"));
              System.out.println("EchoServer: binding in registry");
!             Naming.rebind("//:" + registryPort +
                            "/EchoServer", impl);
              System.out.println("EchoServer ready.");
          } catch (Exception e) {
              System.err.println("EXCEPTION OCCURRED:");
              e.printStackTrace();