am 84fb43aa: Merge "Revert "Upgraded Guava to unmodified v14.0.1""

* commit '84fb43aa6a1e752487f2624055ff26b1b6b7c043':
  Revert "Upgraded Guava to unmodified v14.0.1"

1 files changed, 12 insertions, 6 deletions

diff --git a/guava-tests/test/com/google/common/collect/InternersTest.java b/guava-tests/test/com/google/common/collect/InternersTest.java
index 49ea67c..db11ad2 100644
--- a/guava-tests/test/com/google/common/collect/InternersTest.java
+++ b/guava-tests/test/com/google/common/collect/InternersTest.java
@@ -17,7 +17,6 @@
 package com.google.common.collect;
 
 import com.google.common.base.Function;
-import com.google.common.testing.GcFinalization;
 import com.google.common.testing.NullPointerTester;
 
 import junit.framework.TestCase;
@@ -73,10 +72,17 @@ public class InternersTest extends TestCase {
     assertSame(canonical, pool.intern(canonical));
 
     WeakReference<Integer> signal = new WeakReference<Integer>(canonical);
-    canonical = null;  // Hint to the JIT that canonical is unreachable
-
-    GcFinalization.awaitClear(signal);
-    assertSame(not, pool.intern(not));
+    canonical = null;
+
+    for (int i = 0; i < 3000; i++) {
+      System.gc();
+      if (signal.get() == null) { // it was collected
+        assertSame(not, pool.intern(not));
+        return;
+      }
+      Thread.sleep(1);
+    }
+    fail("reference didn't get cleaned up");
   }
 
   public void testAsFunction_simplistic() {
@@ -90,7 +96,7 @@ public class InternersTest extends TestCase {
     assertSame(canonical, internerFunction.apply(not));
   }
 
-  public void testNullPointerExceptions() {
+  public void testNullPointerExceptions() throws Exception {
     new NullPointerTester().testAllPublicStaticMethods(Interners.class);
   }
 }