test/java/rmi/activation/Activatable/checkAnnotations/CheckAnnotations.java

rev 11003 : 8035000: clean up ActivationLibrary.DestroyThread

*** 1,7 ****
  /*
!  * Copyright (c) 1998, 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.
--- 1,7 ----
  /*
!  * Copyright (c) 1998, 2014, 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.
*** 128,138 ****
              } catch (InterruptedException e) {
              }
  
              myRMI = null;
              System.err.println("rmid shut down");
!             ActivationLibrary.rmidCleanup(rmid);
          }
      }
  
      /**
       * check to make sure that the output from a spawned vm is
--- 128,138 ----
              } catch (InterruptedException e) {
              }
  
              myRMI = null;
              System.err.println("rmid shut down");
!             rmid.cleanup();
          }
      }
  
      /**
       * check to make sure that the output from a spawned vm is