diff options
| author | Eugene Tarassov | 2014-04-25 23:42:30 +0000 |
|---|---|---|
| committer | Eugene Tarassov | 2014-04-25 23:42:30 +0000 |
| commit | 2db71900930543a08718a70879fc32d00f5b559b (patch) | |
| tree | e278c8b43cbb0dd68c28ac9daade8e7c09eeb01a /plugins | |
| parent | 2057a8b79de5843a762a1411bb28f123eaa48681 (diff) | |
| download | org.eclipse.tcf-2db71900930543a08718a70879fc32d00f5b559b.tar.gz org.eclipse.tcf-2db71900930543a08718a70879fc32d00f5b559b.tar.xz org.eclipse.tcf-2db71900930543a08718a70879fc32d00f5b559b.zip | |
TCF Debugger: fixed NullPointerException in MemoryMapWidget
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/commands/MemoryMapWidget.java | 6 |
1 files 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<String, Object> map = (Map<String, Object>) 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()) { |