From 13a82d95306d9d5662fc11cfa5269cd86164bc3a Mon Sep 17 00:00:00 2001
From: Jean Chalard <jchalard@google.com>
Date: Thu, 14 Feb 2013 14:14:48 -0800
Subject: [PATCH] [Lazy2] Pass a runnable to abort
Change-Id: I721afbf426099753aa876a55323eb806b08c24d6
---
.../android/inputmethod/research/ResearchLog.java | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/java/src/com/android/inputmethod/research/ResearchLog.java b/java/src/com/android/inputmethod/research/ResearchLog.java
index 6335b195f6..f7c5fd50e8 100644
--- a/java/src/com/android/inputmethod/research/ResearchLog.java
+++ b/java/src/com/android/inputmethod/research/ResearchLog.java
@@ -98,6 +98,8 @@ public class ResearchLog {
* output.
*
* See class comment for details about {@code JsonWriter} construction.
+ *
+ * @param onClosed run after the close() operation has completed asynchronously
*/
private synchronized void close(final Runnable onClosed) {
mExecutor.submit(new Callable<Object>() {
@@ -144,8 +146,10 @@ public class ResearchLog {
/**
* Waits for publication requests to finish, closes the JsonWriter, but then deletes the backing
* output file.
+ *
+ * @param onAbort run after the abort() operation has completed asynchronously
*/
- private synchronized void abort() {
+ private synchronized void abort(final Runnable onAbort) {
mExecutor.submit(new Callable<Object>() {
@Override
public Object call() throws Exception {
@@ -159,6 +163,9 @@ public class ResearchLog {
if (mFile != null) {
mFile.delete();
}
+ if (onAbort != null) {
+ onAbort.run();
+ }
}
return null;
}
@@ -173,7 +180,7 @@ public class ResearchLog {
* @param timeout time to wait for close in milliseconds
*/
public void blockingAbort(final long timeout) {
- abort();
+ abort(null);
awaitTermination(timeout, TimeUnit.MILLISECONDS);
}
@@ -231,10 +238,10 @@ public class ResearchLog {
return null;
}
});
- } catch (RejectedExecutionException e) {
+ } catch (final RejectedExecutionException e) {
// TODO: Add code to record loss of data, and report.
if (DEBUG) {
- Log.d(TAG, "ResearchLog.publish() rejecting scheduled execution");
+ Log.d(TAG, "ResearchLog.publish() rejecting scheduled execution", e);
}
}
}
--
GitLab