From 2db71900930543a08718a70879fc32d00f5b559b Mon Sep 17 00:00:00 2001 From: Eugene Tarassov Date: Fri, 25 Apr 2014 16:42:30 -0700 Subject: TCF Debugger: fixed NullPointerException in MemoryMapWidget --- .../org/eclipse/tcf/internal/debug/ui/commands/MemoryMapWidget.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/commands/MemoryMapWidget.java b/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/commands/MemoryMapWidget.java index b2230e3f3..90c28c23c 100644 --- a/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/commands/MemoryMapWidget.java +++ b/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/commands/MemoryMapWidget.java @@ -1025,8 +1025,8 @@ public class MemoryMapWidget { Map map = (Map) sym_data.props.get("FileError"); //$NON-NLS-1$ if (map != null) { if (symbolFileInfo.length() > 0) symbolFileInfo.append("\n"); //$NON-NLS-1$ - symbolFileInfo - .append("Symbol file error: ").append(TCFModel.getErrorMessage(new ErrorReport("", map), false)); //$NON-NLS-1$ //$NON-NLS-2$ + String msg = TCFModel.getErrorMessage(new ErrorReport("", map), false); //$NON-NLS-1$ + symbolFileInfo.append("Symbol file error: ").append(msg); //$NON-NLS-1$ } } else if (sym_data.error == null) { @@ -1045,7 +1045,7 @@ public class MemoryMapWidget { } }.get(); - if (symFileInfo.startsWith(r.getFileName())) { + if (symFileInfo != null && symFileInfo.startsWith(r.getFileName())) { String id = symFileInfo.split(", ")[1]; //$NON-NLS-1$ symFileInfo = null; if (!new File(r.getFileName()).exists()) { -- cgit v1.2.3