Merge pull request #51 from square/py/null_check_file

Fix NPE on cleanup
square · May 11, 2015 · bf71228 · bf71228
2 parents ba0de09 + 569a8a1
commit bf71228
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/library/leakcanary-analyzer/src/main/java/com/squareup/leakcanary/HeapAnalyzer.java b/library/leakcanary-analyzer/src/main/java/com/squareup/leakcanary/HeapAnalyzer.java
@@ -15,6 +15,7 @@
  */
 package com.squareup.leakcanary;
 
+import android.util.Log;
 import java.io.File;
 import java.io.FileFilter;
 import java.util.ArrayList;
@@ -57,6 +58,7 @@
 public final class HeapAnalyzer {
 
   private static final String ANONYMOUS_CLASS_NAME_PATTERN = "^.+\\$\\d+$";
+  private static final String TAG = "HeapAnalyzer";
 
   private final ExcludedRefs baseExcludedRefs;
   private final ExcludedRefs excludedRefs;
@@ -337,8 +339,12 @@ private void cleanup(File heapDumpFile, ISnapshot snapshot) {
             .equals(heapDumpFileName);
       }
     });
-    for (File file : toRemove) {
-      file.delete();
+    if (toRemove != null) {
+      for (File file : toRemove) {
+        file.delete();
+      }
+    } else {
+      Log.d(TAG, "Could not find HAHA files to cleanup.");
     }
   }