diff options
| author | Tor Norbye <tnorbye@google.com> | 2012-02-15 15:49:31 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-02-15 15:49:31 -0800 |
| commit | bea9acca6dee4a966e34cc24190a9b6d73af4840 (patch) | |
| tree | 735250ad458b28745bad66e89b250aba347275e2 | |
| parent | 8a244a44ddc0e50f3197f9225ca71e58a1bff75c (diff) | |
| parent | 8b7853ac08ad691cf05ccfd1ee11a72b08ef598b (diff) | |
| download | sdk-bea9acca6dee4a966e34cc24190a9b6d73af4840.zip sdk-bea9acca6dee4a966e34cc24190a9b6d73af4840.tar.gz sdk-bea9acca6dee4a966e34cc24190a9b6d73af4840.tar.bz2 | |
Merge "Fix exception reported on android-developers forum: r can be null"
| -rw-r--r-- | eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/AaptParser.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/AaptParser.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/AaptParser.java index 5e69c99..c4aad6d 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/AaptParser.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/AaptParser.java @@ -718,7 +718,7 @@ public final class AaptParser { IResource r = project.findMember(file); // if the resource is valid, we add the marker - if (r.exists()) { + if (r != null && r.exists()) { return r; } } |