Pass exception back to user

- check object is not null before closing - refs #1160
iBotPeaches · May 5, 2017 · e2f77aa · e2f77aa
1 parent 7947f11
commit e2f77aa
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/ApkDecoder.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/ApkDecoder.java
@@ -167,6 +167,8 @@ public void decode() throws AndrolibException, IOException, DirectoryException {
             mAndrolib.recordUncompressedFiles(mApkFile, mUncompressedFiles);
             mAndrolib.writeOriginalFiles(mApkFile, outDir);
             writeMetaFile();
+        } catch (Exception ex) {
+            throw ex;
         } finally {
             try {
                 mApkFile.close();

diff --git a/brut.j.dir/src/main/java/brut/directory/ExtFile.java b/brut.j.dir/src/main/java/brut/directory/ExtFile.java
@@ -56,7 +56,9 @@ public Directory getDirectory() throws DirectoryException {
     }
 
     public void close() throws IOException {
-        mDirectory.close();
+        if (mDirectory != null) {
+            mDirectory.close();
+        }
     }
 
     private Directory mDirectory;