test/java/rmi/activation/Activatable/nonExistentActivatable/NonExistentActivatable.java

*** 20,30 ****
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   */
  
  /* @test
!  * @bug 4115296
   * @summary synopsis: NoSuchObjectException not thrown for non-existent
   * activatable objects
   * @author Ann Wollrath
   *
   * @library ../../../testlibrary
--- 20,30 ----
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   */
  
  /* @test
!  * @bug 4115296 8085192
   * @summary synopsis: NoSuchObjectException not thrown for non-existent
   * activatable objects
   * @author Ann Wollrath
   *
   * @library ../../../testlibrary
*** 88,100 ****
          TestLibrary.suggestSecurityManager("java.rmi.RMISecurityManager");
  
          RMID rmid = null;
  
          try {
!             RMID.removeLog();
!             rmid = RMID.createRMID();
!             rmid.start();
  
              /* Cause activation groups to have a security policy that will
               * allow security managers to be downloaded and installed
               */
              Properties p = new Properties();
--- 88,98 ----
          TestLibrary.suggestSecurityManager("java.rmi.RMISecurityManager");
  
          RMID rmid = null;
  
          try {
!             rmid = RMID.launch();
  
              /* Cause activation groups to have a security policy that will
               * allow security managers to be downloaded and installed
               */
              Properties p = new Properties();