diff options
| author | Paulo Casanova <pasc@google.com> | 2018-01-25 23:03:40 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-01-25 23:03:40 +0000 |
| commit | b34af68b62cc7a66624152b5e3a03526cc4d3886 (patch) | |
| tree | 8d2bcab81a45360cbc28ced33783ea690aa9e137 | |
| parent | 0214d1425335a8be8e255e13c3b2a309dce78fa4 (diff) | |
| parent | 9bc5c90170ea001af0d5ba280579a7ecb72e828c (diff) | |
| download | apkzlib-b34af68b62cc7a66624152b5e3a03526cc4d3886.tar.gz | |
Fixed use of direct executor. am: 751dbcbf6c
am: 9bc5c90170
Change-Id: Ia073061633bad7e6eb2021cc1f8c0a1f852716d8
| -rw-r--r-- | src/main/java/com/android/apkzlib/zip/ZFile.java | 31 |
1 files changed, 19 insertions, 12 deletions
diff --git a/src/main/java/com/android/apkzlib/zip/ZFile.java b/src/main/java/com/android/apkzlib/zip/ZFile.java index d86a3c5..123e65f 100644 --- a/src/main/java/com/android/apkzlib/zip/ZFile.java +++ b/src/main/java/com/android/apkzlib/zip/ZFile.java @@ -38,6 +38,7 @@ import com.google.common.primitives.Ints; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; +import com.google.common.util.concurrent.MoreExecutors; import com.google.common.util.concurrent.SettableFuture; import java.io.ByteArrayInputStream; import java.io.Closeable; @@ -1560,18 +1561,24 @@ public class ZFile implements Closeable { throws IOException { if (mayCompress) { ListenableFuture<CompressionResult> result = compressor.compress(source); - Futures.addCallback(result, new FutureCallback<CompressionResult>() { - @Override - public void onSuccess(CompressionResult result) { - compressInfo.set(new CentralDirectoryHeaderCompressInfo(newFileData, - result.getCompressionMethod(), result.getSize())); - } - - @Override - public void onFailure(@Nonnull Throwable t) { - compressInfo.setException(t); - } - }); + Futures.addCallback( + result, + new FutureCallback<CompressionResult>() { + @Override + public void onSuccess(CompressionResult result) { + compressInfo.set( + new CentralDirectoryHeaderCompressInfo( + newFileData, + result.getCompressionMethod(), + result.getSize())); + } + + @Override + public void onFailure(@Nonnull Throwable t) { + compressInfo.setException(t); + } + }, + MoreExecutors.directExecutor()); ListenableFuture<CloseableByteSource> compressedByteSourceFuture = Futures.transform(result, CompressionResult::getSource); |