aboutsummaryrefslogtreecommitdiffstats
path: root/AndroidAsync/src/com/koushikdutta/async/future
diff options
context:
space:
mode:
authorKoushik Dutta <koushd@gmail.com>2013-11-13 07:57:17 +0100
committerKoushik Dutta <koushd@gmail.com>2013-11-13 07:57:17 +0100
commitab932d94018a4deb1622917db72df6faa2ac6408 (patch)
treed8db28994aec907de0743bfa89096f8dd13e8387 /AndroidAsync/src/com/koushikdutta/async/future
parent985f582b030e5a9abf0d026e462c57c9f706d39d (diff)
downloadAndroidAsync-ab932d94018a4deb1622917db72df6faa2ac6408.tar.gz
AndroidAsync-ab932d94018a4deb1622917db72df6faa2ac6408.tar.bz2
AndroidAsync-ab932d94018a4deb1622917db72df6faa2ac6408.zip
Revert "SimpleFuture: cancels should trigger callbacks"
This reverts commit f0875c7505876e0467df7249af7d394dd2025113.
Diffstat (limited to 'AndroidAsync/src/com/koushikdutta/async/future')
-rw-r--r--AndroidAsync/src/com/koushikdutta/async/future/SimpleFuture.java3
1 files changed, 0 insertions, 3 deletions
diff --git a/AndroidAsync/src/com/koushikdutta/async/future/SimpleFuture.java b/AndroidAsync/src/com/koushikdutta/async/future/SimpleFuture.java
index fd09db4..0b6fb29 100644
--- a/AndroidAsync/src/com/koushikdutta/async/future/SimpleFuture.java
+++ b/AndroidAsync/src/com/koushikdutta/async/future/SimpleFuture.java
@@ -18,14 +18,11 @@ public class SimpleFuture<T> extends SimpleCancellable implements DependentFutur
if (!super.cancel())
return false;
// still need to release any pending waiters
- FutureCallback<T> callback;
synchronized (this) {
exception = new CancellationException();
callback = null;
releaseWaiterLocked();
- callback = handleCompleteLocked();
}
- handleCallbackUnlocked(callback);
return true;
}