MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

always close jar builder

Browse Source
This commit is contained in:
Eugene Kudelevsky
2012-05-14 14:25:57 +04:00
parent f7d59e8358
commit f48d454efe
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/android/common/src/org/jetbrains/android/compiler/tools/AndroidApkBuilder.java
+14 -2
View File
@@ -156,6 +156,7 @@ public class AndroidApkBuilder {
result.put(WARNING, new ArrayList<String>());
FileOutputStream fos = null;
SignedJarBuilder builder = null;
try {
String keyStoreOsPath = customKeystorePath != null && customKeystorePath.length() > 0
@@ -212,7 +213,7 @@ public class AndroidApkBuilder {
}
fos = new FileOutputStream(outputApk);
SignedJarBuilder builder = new SignedJarBuilder(fos, key, certificate);
builder = new SignedJarBuilder(fos, key, certificate);
FileInputStream fis = new FileInputStream(apkPath);
try {
@@ -265,7 +266,6 @@ public class AndroidApkBuilder {
}
}
}
builder.close();
}
catch (IOException e) {
return addExceptionMessage(e, result);
@@ -292,6 +292,18 @@ public class AndroidApkBuilder {
return addExceptionMessage(e, result);
}
finally {
if (builder != null) {
try {
builder.close();
}
catch (IOException e) {
addExceptionMessage(e, result);
}
catch (GeneralSecurityException e) {
addExceptionMessage(e, result);
}
}
if (fos != null) {
try {
fos.close();