test/java/rmi/testlibrary/ActivationLibrary.java

*** 64,74 ****
      public static void deactivate(Remote remote,
                                    ActivationID id) {
          // We do as much as 50 deactivation trials, each separated by
          // at least 100 milliseconds sleep time (max sleep time of 5 secs).
          final long deactivateSleepTime = 100;
!         for (int i = 0; i < 50; i ++) {
              try {
                  if (Activatable.inactive(id) == true) {
                      mesg("inactive successful");
                      return;
                  } else {
--- 64,75 ----
      public static void deactivate(Remote remote,
                                    ActivationID id) {
          // We do as much as 50 deactivation trials, each separated by
          // at least 100 milliseconds sleep time (max sleep time of 5 secs).
          final long deactivateSleepTime = 100;
!         long stopTime = System.currentTimeMillis() + deactivateSleepTime * 50;
!         while (System.currentTimeMillis() < stopTime) {
              try {
                  if (Activatable.inactive(id) == true) {
                      mesg("inactive successful");
                      return;
                  } else {