Merge "Close FileChannels in UpdateHandler#copyFile." into nyc-dev

am: fce8ed98aa

* commit 'fce8ed98aa738a13332b6ccc9c5b145f17fae51f':
  Close FileChannels in UpdateHandler#copyFile.

1 files changed, 10 insertions, 2 deletions

diff --git a/java/src/com/android/inputmethod/dictionarypack/UpdateHandler.java b/java/src/com/android/inputmethod/dictionarypack/UpdateHandler.java
index 0517bc814..6b32c684f 100644
--- a/java/src/com/android/inputmethod/dictionarypack/UpdateHandler.java
+++ b/java/src/com/android/inputmethod/dictionarypack/UpdateHandler.java
@@ -689,8 +689,16 @@ public final class UpdateHandler {
         } else {
             try {
                 final FileChannel sourceChannel = ((FileInputStream) in).getChannel();
-                final FileChannel destinationChannel = ((FileOutputStream) out).getChannel();
-                sourceChannel.transferTo(0, Integer.MAX_VALUE, destinationChannel);
+                try {
+                    final FileChannel destinationChannel = ((FileOutputStream) out).getChannel();
+                    try {
+                        sourceChannel.transferTo(0, Integer.MAX_VALUE, destinationChannel);
+                    } finally {
+                        destinationChannel.close();
+                    }
+                } finally {
+                    sourceChannel.close();
+                }
             } catch (IOException e) {
                 // Can't work with channels, or something went wrong. Copy by hand.
                 DebugLogUtils.l("Won't work");