nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Make sure all FDs are correctly closed." into jb-mr1.1-dev

main
Jean Chalard 2012-11-13 18:42:32 -08:00 committed by Android (Google) Code Review
parent fac619a34c 5c32b6da44
commit 7648b37d1e
1 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
java/src/com/android/inputmethod/latin/BinaryDictionaryFileDumper.java
View File

@ -154,6 +154,9 @@ public final class BinaryDictionaryFileDumper {
for (int mode = MODE_MIN; mode <= MODE_MAX; ++mode) { for (int mode = MODE_MIN; mode <= MODE_MAX; ++mode) {
InputStream originalSourceStream = null; InputStream originalSourceStream = null;
InputStream inputStream = null; InputStream inputStream = null;
InputStream uncompressedStream = null;
InputStream decryptedStream = null;
BufferedInputStream bufferedStream = null;
File outputFile = null; File outputFile = null;
FileOutputStream outputStream = null; FileOutputStream outputStream = null;
AssetFileDescriptor afd = null; AssetFileDescriptor afd = null;
@ -173,18 +176,19 @@ public final class BinaryDictionaryFileDumper {
// Get the appropriate decryption method for this try // Get the appropriate decryption method for this try
switch (mode) { switch (mode) {
case COMPRESSED_CRYPTED_COMPRESSED: case COMPRESSED_CRYPTED_COMPRESSED:
inputStream = FileTransforms.getUncompressedStream( uncompressedStream =
FileTransforms.getDecryptedStream( FileTransforms.getUncompressedStream(originalSourceStream);
FileTransforms.getUncompressedStream( decryptedStream = FileTransforms.getDecryptedStream(uncompressedStream);
originalSourceStream))); inputStream = FileTransforms.getUncompressedStream(decryptedStream);
break; break;
case CRYPTED_COMPRESSED: case CRYPTED_COMPRESSED:
inputStream = FileTransforms.getUncompressedStream( decryptedStream = FileTransforms.getDecryptedStream(originalSourceStream);
FileTransforms.getDecryptedStream(originalSourceStream)); inputStream = FileTransforms.getUncompressedStream(decryptedStream);
break; break;
case COMPRESSED_CRYPTED: case COMPRESSED_CRYPTED:
inputStream = FileTransforms.getDecryptedStream( uncompressedStream =
FileTransforms.getUncompressedStream(originalSourceStream)); FileTransforms.getUncompressedStream(originalSourceStream);
inputStream = FileTransforms.getDecryptedStream(uncompressedStream);
break; break;
case COMPRESSED_ONLY: case COMPRESSED_ONLY:
inputStream = FileTransforms.getUncompressedStream(originalSourceStream); inputStream = FileTransforms.getUncompressedStream(originalSourceStream);
@ -195,8 +199,9 @@ public final class BinaryDictionaryFileDumper {
case NONE: case NONE:
inputStream = originalSourceStream; inputStream = originalSourceStream;
break; break;
} }
checkMagicAndCopyFileTo(new BufferedInputStream(inputStream), outputStream); bufferedStream = new BufferedInputStream(inputStream);
checkMagicAndCopyFileTo(bufferedStream, outputStream);
outputStream.flush(); outputStream.flush();
outputStream.close(); outputStream.close();
final File finalFile = new File(finalFileName); final File finalFile = new File(finalFileName);
@ -228,8 +233,11 @@ public final class BinaryDictionaryFileDumper {
try { try {
// inputStream.close() will close afd, we should not call afd.close(). // inputStream.close() will close afd, we should not call afd.close().
if (null != inputStream) inputStream.close(); if (null != inputStream) inputStream.close();
if (null != uncompressedStream) uncompressedStream.close();
if (null != decryptedStream) decryptedStream.close();
if (null != bufferedStream) bufferedStream.close();
} catch (Exception e) { } catch (Exception e) {
Log.e(TAG, "Exception while closing a cross-process file descriptor : " + e); Log.e(TAG, "Exception while closing a file descriptor : " + e);
} }
try { try {
if (null != outputStream) outputStream.close(); if (null != outputStream) outputStream.close();