Merge "Close FileChannels in UpdateHandler#copyFile." into nyc-dev
am: fce8ed98aa
* commit 'fce8ed98aa738a13332b6ccc9c5b145f17fae51f':
Close FileChannels in UpdateHandler#copyFile.
main
commit
14ff0a66f0
|
@ -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");
|
||||||
|
|
Loading…
Reference in New Issue