diff options
| author | Tor Norbye <tnorbye@google.com> | 2012-09-21 16:37:47 -0700 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2012-09-21 16:37:47 -0700 |
| commit | 962383255d9f553e4ac18f793d3fb652780334b1 (patch) | |
| tree | 3c08c05f50d4258ec5391d2925e8541966d2cfed | |
| parent | 646cdd6982c4d66927cd010dcb33a46e678b2665 (diff) | |
| parent | 09bc0beba425c628051a87a4c8bc5070a1240277 (diff) | |
| download | sdk-962383255d9f553e4ac18f793d3fb652780334b1.zip sdk-962383255d9f553e4ac18f793d3fb652780334b1.tar.gz sdk-962383255d9f553e4ac18f793d3fb652780334b1.tar.bz2 | |
Merge "Prevent potential NPE"
| -rw-r--r-- | eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/ContextPullParser.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/ContextPullParser.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/ContextPullParser.java index c30574b..90ea2a5 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/ContextPullParser.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/ContextPullParser.java @@ -120,7 +120,7 @@ public class ContextPullParser extends KXmlParser implements ILayoutPullParser { } // Handle unicode escapes - if (value.indexOf('\\') != -1) { + if (value != null && value.indexOf('\\') != -1) { value = AdtUtils.replaceUnicodeEscapes(value); } |