diff options
| author | Tor Norbye <tnorbye@google.com> | 2011-01-30 22:22:00 -0800 |
|---|---|---|
| committer | Android Code Review <code-review@android.com> | 2011-01-30 22:22:00 -0800 |
| commit | b10589d756866cd682b8af91d5aa668a78dbfa52 (patch) | |
| tree | 6f2e97f011defa8647c74b58b0d12c3b577b6991 | |
| parent | f6cb9d0a6104d2dad4893d012b2f32f91b6d04c7 (diff) | |
| parent | 855ca2ca2f30e72a8d82a4c2fb2750438fc15dd2 (diff) | |
| download | sdk-b10589d756866cd682b8af91d5aa668a78dbfa52.zip sdk-b10589d756866cd682b8af91d5aa668a78dbfa52.tar.gz sdk-b10589d756866cd682b8af91d5aa668a78dbfa52.tar.bz2 | |
Merge "Guard against possible NPE."
| -rw-r--r-- | eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/GraphicalEditorPart.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/editors/layout/gle2/GraphicalEditorPart.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/GraphicalEditorPart.java index cb5c849..eda6514 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/GraphicalEditorPart.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/GraphicalEditorPart.java @@ -1519,7 +1519,7 @@ public class GraphicalEditorPart extends EditorPart canvas.setSession(session, explodeNodes); // update the UiElementNode with the layout info. - if (session.getResult().isSuccess() == false) { + if (session != null && session.getResult().isSuccess() == false) { // An error was generated. Print it (and any other accumulated warnings) String errorMessage = session.getResult().getErrorMessage(); Throwable exception = session.getResult().getException(); |