AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid to fail to close stream on exception

Browse Source 
Move .close() to finally block.
Found by spotbugs.

Change-Id: I1d11f52c79e805082f05801e4ef0ec94c6dc4e6e
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
This commit is contained in:
André Klitzing 2018-03-02 22:01:22 +01:00
parent ef242e0b34
commit 5269f6d55e
1 changed files with 43 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/android/java/src/org/qtproject/qt5/android/bindings/QtLoader.java
View File

@ -355,12 +355,21 @@ public abstract class QtLoader {
destinationFile.createNewFile();
AssetManager assetsManager = m_context.getAssets();
InputStream inputStream = assetsManager.open(source);
OutputStream outputStream = new FileOutputStream(destinationFile);
copyFile(inputStream, outputStream);
InputStream inputStream = null;
OutputStream outputStream = null;
try {
inputStream = assetsManager.open(source);
outputStream = new FileOutputStream(destinationFile);
copyFile(inputStream, outputStream);
catch (Exception e) {
e.printStackTrace();
} finally {
if (inputStream != null)
inputStream.close();
inputStream.close();
outputStream.close();
if (outputStream != null)
outputStream.close();
}
}
private static void createBundledBinary(String source, String destination)
@ -377,12 +386,21 @@ public abstract class QtLoader {
destinationFile.createNewFile();
InputStream inputStream = new FileInputStream(source);
OutputStream outputStream = new FileOutputStream(destinationFile);
copyFile(inputStream, outputStream);
InputStream inputStream = null;
OutputStream outputStream = null;
try {
inputStream = new FileInputStream(source);
outputStream = new FileOutputStream(destinationFile);
copyFile(inputStream, outputStream);
catch (Exception e) {
e.printStackTrace();
} finally {
if (inputStream != null)
inputStream.close();
inputStream.close();
outputStream.close();
if (outputStream != null)
outputStream.close();
}
}
private boolean cleanCacheIfNecessary(String pluginsPrefix, long packageVersion)
@ -391,12 +409,15 @@ public abstract class QtLoader {
long cacheVersion = 0;
if (versionFile.exists() && versionFile.canRead()) {
DataInputStream inputStream = null;
try {
DataInputStream inputStream = new DataInputStream(new FileInputStream(versionFile));
inputStream = new DataInputStream(new FileInputStream(versionFile));
cacheVersion = inputStream.readLong();
inputStream.close();
} catch (Exception e) {
e.printStackTrace();
} finally {
if (inputStream != null)
inputStream.close();
}
}
@ -431,9 +452,16 @@ public abstract class QtLoader {
versionFile.createNewFile();
DataOutputStream outputStream = new DataOutputStream(new FileOutputStream(versionFile));
outputStream.writeLong(packageVersion);
outputStream.close();
DataOutputStream outputStream = null;
try {
outputStream = new DataOutputStream(new FileOutputStream(versionFile));
outputStream.writeLong(packageVersion);
catch (Exception e) {
e.printStackTrace();
} finally {
if (outputStream != null)
outputStream.close();
}
}
{