From f7d1e37031f32285ac368e38b21da4fc7574a99d Mon Sep 17 00:00:00 2001
From: Connor Tumbleson <connor.tumbleson@gmail.com>
Date: Tue, 18 Sep 2012 12:32:29 -0500
Subject: [PATCH] fixing assetDir null problem

---
 apktool-lib/src/main/java/brut/androlib/Androlib.java | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/apktool-lib/src/main/java/brut/androlib/Androlib.java b/apktool-lib/src/main/java/brut/androlib/Androlib.java
index 31b72b2c..3ea6b496 100644
--- a/apktool-lib/src/main/java/brut/androlib/Androlib.java
+++ b/apktool-lib/src/main/java/brut/androlib/Androlib.java
@@ -467,17 +467,16 @@ public class Androlib {
                 editOrig.addFolder(new File(appDir,  APK_DIRNAME + "/res").getAbsolutePath(), parameters);
                 
                 // add assets, if there
-                if (assetDir.exists()) {
+                if (assetDir != null) {
                     //editOrig.addFolder(new File(appDir, APK_DIRNAME + "/assets").getAbsolutePath(), parameters);
                 }
                 
                 // add resources.arsc
                 parameters.setFileNameInZip("resources.arsc");
                // editOrig.addFile(new File(appDir, "resources.arsc"), parameters);
-            } catch(ZipException e) {
-                LOGGER.warning(e.getMessage());
+            } catch(ZipException ex) {
+                throw new AndrolibException(ex);
             }
-            
         }
     }