test/com/sun/jndi/rmi/registry/RegistryContext/ContextWithNullProperties.java

*** 1,7 ****
  /*
!  * Copyright (c) 2010, 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) 2010, 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.
*** 23,50 ****
  
  /*
   * @test
   * @bug 6676075
   * @summary RegistryContext (com.sun.jndi.url.rmi.rmiURLContext) coding problem
   */
  
  import java.rmi.RemoteException;
! import java.rmi.registry.LocateRegistry;
! 
! import com.sun.jndi.rmi.registry.*;
  
  public class ContextWithNullProperties {
- 
      public static void main(String[] args) throws Exception {
! 
!         // Create registry on port 1099 if one is not already running.
!         try {
!             LocateRegistry.createRegistry(1099);
!         } catch (RemoteException e) {
!         }
! 
          System.out.println("Connecting to the default Registry...");
          // Connect to the default Registry.
          // Pass null as the JNDI environment properties (see final argument)
!         RegistryContext ctx = new RegistryContext(null, -1, null);
      }
  }
--- 23,46 ----
  
  /*
   * @test
   * @bug 6676075
   * @summary RegistryContext (com.sun.jndi.url.rmi.rmiURLContext) coding problem
+  * @library ../../../../../../java/rmi/testlibrary
+  * @build TestLibrary
+  * @run main ContextWithNullProperties
   */
  
+ import com.sun.jndi.rmi.registry.RegistryContextsun.jndi.rmi.RegistryContext;
  import java.rmi.RemoteException;
! import java.rmi.registry.Registry;
  
  public class ContextWithNullProperties {
      public static void main(String[] args) throws Exception {
!         Registry registry = TestLibrary.createRegistryOnUnusedPort();
!         int registryPort = TestLibrary.getRegistryPort(registry);
          System.out.println("Connecting to the default Registry...");
          // Connect to the default Registry.
          // Pass null as the JNDI environment properties (see final argument)
!         RegistryContext ctx = new RegistryContext(null, registryPort, null);
      }
  }