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

main
Keisuke Kuroyanagi 2016-02-25 04:23:32 +00:00 committed by Android (Google) Code Review
commit fce8ed98aa
1 changed files with 10 additions and 2 deletions

View File

@ -689,8 +689,16 @@ public final class UpdateHandler {
} else { } else {
try { try {
final FileChannel sourceChannel = ((FileInputStream) in).getChannel(); final FileChannel sourceChannel = ((FileInputStream) in).getChannel();
final FileChannel destinationChannel = ((FileOutputStream) out).getChannel(); try {
sourceChannel.transferTo(0, Integer.MAX_VALUE, destinationChannel); final FileChannel destinationChannel = ((FileOutputStream) out).getChannel();
try {
sourceChannel.transferTo(0, Integer.MAX_VALUE, destinationChannel);
} finally {
destinationChannel.close();
}
} finally {
sourceChannel.close();
}
} catch (IOException e) { } catch (IOException e) {
// Can't work with channels, or something went wrong. Copy by hand. // Can't work with channels, or something went wrong. Copy by hand.
DebugLogUtils.l("Won't work"); DebugLogUtils.l("Won't work");