jdk/test/javax/rmi/PortableRemoteObject/ConcurrentHashMapTest.java

*** 26,41 ****
   * @bug 8068721
   * @summary test RMI-IIOP call with ConcurrentHashMap as an argument
   * @library /lib/testlibrary
   * @modules java.corba
   * @build jdk.testlibrary.*
!  * @compile -addmods java.corba Test.java HelloInterface.java HelloServer.java HelloClient.java
   *    HelloImpl.java _HelloImpl_Tie.java _HelloInterface_Stub.java ConcurrentHashMapTest.java
!  * @run main/othervm -addmods java.corba -Djava.naming.provider.url=iiop://localhost:1050
   *    -Djava.naming.factory.initial=com.sun.jndi.cosnaming.CNCtxFactory ConcurrentHashMapTest
   * @run main/othervm/secure=java.lang.SecurityManager/policy=jtreg.test.policy
!  *    -addmods java.corba -Djava.naming.provider.url=iiop://localhost:1050
   *    -Djava.naming.factory.initial=com.sun.jndi.cosnaming.CNCtxFactory ConcurrentHashMapTest
   * @key intermittent
   */
  
  
--- 26,41 ----
   * @bug 8068721
   * @summary test RMI-IIOP call with ConcurrentHashMap as an argument
   * @library /lib/testlibrary
   * @modules java.corba
   * @build jdk.testlibrary.*
!  * @compile Test.java HelloInterface.java HelloServer.java HelloClient.java
   *    HelloImpl.java _HelloImpl_Tie.java _HelloInterface_Stub.java ConcurrentHashMapTest.java
!  * @run main/othervm -Djava.naming.provider.url=iiop://localhost:1050
   *    -Djava.naming.factory.initial=com.sun.jndi.cosnaming.CNCtxFactory ConcurrentHashMapTest
   * @run main/othervm/secure=java.lang.SecurityManager/policy=jtreg.test.policy
!  *    -Djava.naming.provider.url=iiop://localhost:1050
   *    -Djava.naming.factory.initial=com.sun.jndi.cosnaming.CNCtxFactory ConcurrentHashMapTest
   * @key intermittent
   */
  
  
*** 96,111 ****
      }
  
  
      static void startRmiIiopServer() throws Exception {
          System.out.println("\nStarting RmiServer");
!         // java -cp . -addmods java.corba
          // -Djava.naming.factory.initial=com.sun.jndi.cosnaming.CNCtxFactory
          // -Djava.naming.provider.url=iiop://localhost:1050 HelloServer
          List<String> commands = new ArrayList<>();
          commands.add(ConcurrentHashMapTest.JAVA);
!         commands.add("-addmods");
          commands.add("java.corba");
          commands.add("-Djava.naming.factory.initial=com.sun.jndi.cosnaming.CNCtxFactory");
          commands.add("-Djava.naming.provider.url=iiop://localhost:1050");
          commands.add("-cp");
          commands.add(ConcurrentHashMapTest.CLASSPATH);
--- 96,111 ----
      }
  
  
      static void startRmiIiopServer() throws Exception {
          System.out.println("\nStarting RmiServer");
!         // java -cp . --add-modules java.corba
          // -Djava.naming.factory.initial=com.sun.jndi.cosnaming.CNCtxFactory
          // -Djava.naming.provider.url=iiop://localhost:1050 HelloServer
          List<String> commands = new ArrayList<>();
          commands.add(ConcurrentHashMapTest.JAVA);
!         commands.add("--add-modules");
          commands.add("java.corba");
          commands.add("-Djava.naming.factory.initial=com.sun.jndi.cosnaming.CNCtxFactory");
          commands.add("-Djava.naming.provider.url=iiop://localhost:1050");
          commands.add("-cp");
          commands.add(ConcurrentHashMapTest.CLASSPATH);