diff options
| author | Tor Norbye <tnorbye@google.com> | 2011-08-26 15:31:14 -0700 |
|---|---|---|
| committer | Tor Norbye <tnorbye@google.com> | 2011-09-01 13:53:26 -0700 |
| commit | 789e8319317a4856c71681d52c5e90a0e56e2c7c (patch) | |
| tree | 0ee5456aeb41b413a15e16fdfd179fcd3520530f /ide_common/src/com | |
| parent | d9e813f08e94442050d18dcc9ac5949577f7618a (diff) | |
| download | sdk-789e8319317a4856c71681d52c5e90a0e56e2c7c.zip sdk-789e8319317a4856c71681d52c5e90a0e56e2c7c.tar.gz sdk-789e8319317a4856c71681d52c5e90a0e56e2c7c.tar.bz2 | |
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
Diffstat (limited to 'ide_common/src/com')
| -rw-r--r-- | ide_common/src/com/android/ide/common/resources/ResourceFolder.java | 10 |
1 files changed, 6 insertions, 4 deletions
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 --- 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(); + } } /** |