diff options
author | Xavier Ducrohet <xav@android.com> | 2010-08-27 17:00:56 -0700 |
---|---|---|
committer | Android Code Review <code-review@android.com> | 2010-08-27 17:00:56 -0700 |
commit | c8079b0edde6c191fdca26f2c7ac49ce3bdf7a91 (patch) | |
tree | 551fbe590b052cbeb9e70746a679b471ee9a0f4e /eclipse/plugins | |
parent | 99bd6912e7b5b97fc6d4bb787e76b2d9dfffd7ae (diff) | |
parent | 7c1016d5a22fdc0dcbac4e55970e03f2d284e0a5 (diff) | |
download | sdk-c8079b0edde6c191fdca26f2c7ac49ce3bdf7a91.zip sdk-c8079b0edde6c191fdca26f2c7ac49ce3bdf7a91.tar.gz sdk-c8079b0edde6c191fdca26f2c7ac49ce3bdf7a91.tar.bz2 |
Merge "NPE in FolderDecorater"
Diffstat (limited to 'eclipse/plugins')
-rw-r--r-- | eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/project/FolderDecorator.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/project/FolderDecorator.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/project/FolderDecorator.java index b7ba2fe..7ca244c 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/project/FolderDecorator.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/project/FolderDecorator.java @@ -49,6 +49,9 @@ public class FolderDecorator implements ILightweightLabelDecorator { // get the project and make sure this is an android project IProject project = folder.getProject(); + if (project == null || !project.exists() || !folder.exists()) { + return; + } try { if (project.hasNature(AndroidConstants.NATURE_DEFAULT)) { |