aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTor Norbye <tnorbye@google.com>2012-02-15 12:08:51 -0800
committerTor Norbye <tnorbye@google.com>2012-02-15 12:08:51 -0800
commit8b7853ac08ad691cf05ccfd1ee11a72b08ef598b (patch)
tree8d3af9fa13659b7ceccdfea063c04d21a03f5763
parentfaf7b68609a860c9f818bc7c8c01c14a3d969e18 (diff)
downloadsdk-8b7853ac08ad691cf05ccfd1ee11a72b08ef598b.zip
sdk-8b7853ac08ad691cf05ccfd1ee11a72b08ef598b.tar.gz
sdk-8b7853ac08ad691cf05ccfd1ee11a72b08ef598b.tar.bz2
Fix exception reported on android-developers forum: r can be null
Change-Id: Iff529a37901b62bcbc53b23189d1aaa2215dbfea
-rw-r--r--eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/AaptParser.java2
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;
}
}