aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaphael <raphael@google.com>2010-04-01 15:41:38 -0700
committerRaphael <raphael@google.com>2010-04-01 16:57:08 -0700
commit8f9369f1bff3a118b4b5fdba1ea6fdaa8782664d (patch)
tree80ccb664900207a79173a9a2ff930ef39ac45265
parentb1a1a2bf4d9e81a3e85fe211f299c6caf7e8fe35 (diff)
downloadsdk-8f9369f1bff3a118b4b5fdba1ea6fdaa8782664d.zip
sdk-8f9369f1bff3a118b4b5fdba1ea6fdaa8782664d.tar.gz
sdk-8f9369f1bff3a118b4b5fdba1ea6fdaa8782664d.tar.bz2
Project lib NPE when closing a lib project.
(merge Change Ia77122bc from master) Change-Id: Iad27a002d387f9537e487ddd669831ef65e9e7b0
-rw-r--r--eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/project/ProjectState.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/project/ProjectState.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/project/ProjectState.java
index 11cbc15..2a55f74 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/project/ProjectState.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/project/ProjectState.java
@@ -359,7 +359,8 @@ public final class ProjectState {
public LibraryState getLibrary(IProject library) {
synchronized (mLibraries) {
for (LibraryState state : mLibraries) {
- if (state.getProjectState().equals(library)) {
+ ProjectState ps = state.getProjectState();
+ if (ps != null && ps.equals(library)) {
return state;
}
}