test/java/rmi/activation/Activatable/nestedActivate/NestedActivate.java

*** 20,30 ****
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   */
  
  /* @test
!  * @bug 4138056
   * @summary synopsis: Activating objects from an Activatable constructor causes deadlock
   * @author Ann Wollrath
   *
   * @library ../../../testlibrary
   * @modules java.rmi/sun.rmi.registry
--- 20,30 ----
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   */
  
  /* @test
!  * @bug 4138056 8085192
   * @summary synopsis: Activating objects from an Activatable constructor causes deadlock
   * @author Ann Wollrath
   *
   * @library ../../../testlibrary
   * @modules java.rmi/sun.rmi.registry
*** 98,111 ****
          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
               */
              final Properties p = new Properties();
              // this test must always set policies/managers in its
--- 98,108 ----
          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
               */
              final Properties p = new Properties();
              // this test must always set policies/managers in its