aboutsummaryrefslogtreecommitdiff
path: root/utils
diff options
context:
space:
mode:
authorChristian Williams <antixian666@gmail.com>2017-08-09 15:35:06 -0700
committerGitHub <noreply@github.com>2017-08-09 15:35:06 -0700
commit8a11646e32a904f6ad2e33b3bcbadbbbf71bd75f (patch)
treeff7927740c33343f4db82fd3b5669f0ed6c7ea15 /utils
parent5242d1330b4b351adc8ad605c2502ad8b5a2d473 (diff)
parent2739cf24b973455fd3ff24a02f338ea1b4613222 (diff)
downloadrobolectric-shadows-8a11646e32a904f6ad2e33b3bcbadbbbf71bd75f.tar.gz
Merge pull request #3321 from robolectric/dont-use-simplefuture
Don't use SimpleFuture
Diffstat (limited to 'utils')
-rw-r--r--utils/src/main/java/org/robolectric/util/SimpleFuture.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/utils/src/main/java/org/robolectric/util/SimpleFuture.java b/utils/src/main/java/org/robolectric/util/SimpleFuture.java
index c5c72775a..f8f25c109 100644
--- a/utils/src/main/java/org/robolectric/util/SimpleFuture.java
+++ b/utils/src/main/java/org/robolectric/util/SimpleFuture.java
@@ -8,7 +8,9 @@ import java.util.concurrent.TimeUnit;
* A Future represents the result of an asynchronous computation.
*
* @param <T> The result type returned by this Future's get method.
+ * @deprecation This class can introduce deadlocks, since its lock is held while invoking run().
*/
+@Deprecated
public class SimpleFuture<T> {
private T result;
private boolean hasRun;
@@ -66,4 +68,4 @@ public class SimpleFuture<T> {
protected void done() {
}
-} \ No newline at end of file
+}