Fix NPE in ResourceFolder when deleting folders

This CL fixes an NPE I was hitting when deleting resource folders in
an Android project - looks like the children list is populated lazily
and dispose does not account for this

java.lang.NullPointerException
at ResourceFolder.dispose(ResourceFolder.java:131)
at ResourceRepository.removeFolder(ResourceRepository.java:146)

Change-Id: I96974c68b4ef13e6e348efd6269270d4525322ab

diff --git a/ide_common/src/com/android/ide/common/resources/ResourceFolder.java b/ide_common/src/com/android/ide/common/resources/ResourceFolder.java
index 135fbeb..e55e14c 100644 (file)
--- a/ide_common/src/com/android/ide/common/resources/ResourceFolder.java
+++ b/ide_common/src/com/android/ide/common/resources/ResourceFolder.java
@@ -128,11 +128,13 @@ public final class ResourceFolder implements Configurable {
     }
 
     protected void dispose() {
-        for (ResourceFile file : mFiles) {
-            file.dispose();
-        }
+        if (mFiles != null) {
+            for (ResourceFile file : mFiles) {
+                file.dispose();
+            }
 
-        mFiles.clear();
+            mFiles.clear();
+        }
     }
 
     /**