test/java/rmi/testlibrary/ActivationLibrary.java

*** 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.
*** 23,34 ****
  
  /**
   *
   */
  
- import java.io.File;
- import java.rmi.Naming;
  import java.rmi.NoSuchObjectException;
  import java.rmi.NotBoundException;
  import java.rmi.Remote;
  import java.rmi.activation.Activatable;
  import java.rmi.activation.ActivationID;
--- 23,32 ----
*** 120,130 ****
           */
          final long rmidWaitingStepTime = 100;
          for (int i = 0; i <= 74; i++) {
  
              try {
!                 LocateRegistry.getRegistry(port).lookup(SYSTEM_NAME);
                  mesg("Activation System available after " +
                       (i * rmidWaitingStepTime) + " milliseconds");
                  return true;
  
              } catch (java.rmi.ConnectException e) {
--- 118,130 ----
           */
          final long rmidWaitingStepTime = 100;
          for (int i = 0; i <= 74; i++) {
  
              try {
!                 ActivationSystem system = (ActivationSystem)LocateRegistry.getRegistry(port).lookup(SYSTEM_NAME);
!                 if (system == null)
!                     continue;
                  mesg("Activation System available after " +
                       (i * rmidWaitingStepTime) + " milliseconds");
                  return true;
  
              } catch (java.rmi.ConnectException e) {