test/jdk/java/util/zip/ZipFile/FinalizeZipFile.java

@@ -29,10 +29,11 @@
 
 import java.io.*;
 import java.util.Random;
 import java.util.zip.*;
 import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
 
 public class FinalizeZipFile {
 
     private static final CountDownLatch finalizersDone = new CountDownLatch(3);
 

@@ -76,14 +77,13 @@
         }
     }
 
     public static void realMain(String[] args) throws Throwable {
         makeGarbage();
-
+        while (!finalizersDone.await(10, TimeUnit.MILLISECONDS)) {
         System.gc();
-        finalizersDone.await();
-
+        }
         // Not all ZipFiles were collected?
         equal(finalizersDone.getCount(), 0L);
     }
 
     //--------------------- Infrastructure ---------------------------