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

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

1 files changed, 3 insertions, 6 deletions

diff --git a/guava-tests/test/com/google/common/util/concurrent/ListenableFutureTester.java b/guava-tests/test/com/google/common/util/concurrent/ListenableFutureTester.java
index cb10fc8..367b95a 100644
--- a/guava-tests/test/com/google/common/util/concurrent/ListenableFutureTester.java
+++ b/guava-tests/test/com/google/common/util/concurrent/ListenableFutureTester.java
@@ -16,7 +16,6 @@
 
 package com.google.common.util.concurrent;
 
-import static com.google.common.base.Preconditions.checkNotNull;
 import static junit.framework.Assert.assertEquals;
 import static junit.framework.Assert.assertFalse;
 import static junit.framework.Assert.assertTrue;
@@ -29,8 +28,6 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 
-import javax.annotation.Nullable;
-
 /**
  * Used to test listenable future implementations.
  *
@@ -44,7 +41,7 @@ public class ListenableFutureTester {
 
   public ListenableFutureTester(ListenableFuture<?> future) {
     this.exec = Executors.newCachedThreadPool();
-    this.future = checkNotNull(future);
+    this.future = future;
     this.latch = new CountDownLatch(1);
   }
 
@@ -64,7 +61,7 @@ public class ListenableFutureTester {
     exec.shutdown();
   }
 
-  public void testCompletedFuture(@Nullable Object expectedValue)
+  public void testCompletedFuture(Object expectedValue)
       throws InterruptedException, ExecutionException {
     assertTrue(future.isDone());
     assertFalse(future.isCancelled());
@@ -91,7 +88,7 @@ public class ListenableFutureTester {
     } catch (CancellationException expected) {}
   }
 
-  public void testFailedFuture(@Nullable String message)
+  public void testFailedFuture(String message)
       throws InterruptedException {
     assertTrue(future.isDone());
     assertFalse(future.isCancelled());