From e2f77aac183214bb4fe0b1e6247bfec1a76f4f35 Mon Sep 17 00:00:00 2001
From: Connor Tumbleson <me@connortumbleson.com>
Date: Fri, 5 May 2017 07:46:56 -0400
Subject: [PATCH] Pass exception back to user

 - check object is not null before closing
 - refs #1160
---
 .../apktool-lib/src/main/java/brut/androlib/ApkDecoder.java   | 2 ++
 brut.j.dir/src/main/java/brut/directory/ExtFile.java          | 4 +++-
 2 files changed, 5 insertions(+), 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
index 944faaeb..34ec103e 100644
--- 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 class ApkDecoder {
             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
index 008e1b45..7da9f260 100644
--- 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 class ExtFile extends File {
     }
 
     public void close() throws IOException {
-        mDirectory.close();
+        if (mDirectory != null) {
+            mDirectory.close();
+        }
     }
 
     private Directory mDirectory;