Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEugene Tarassov2013-12-10 15:37:50 -0500
committerEugene Tarassov2013-12-10 15:37:50 -0500
commitfcc67d234b1665c188a07c53c2aa3779a76a95db (patch)
tree51ead3bb6bb910550c699099bf055cd41ad8716b
parentcb30de4391c6daeff5892acfef6fca78d76f2f66 (diff)
downloadorg.eclipse.tcf-fcc67d234b1665c188a07c53c2aa3779a76a95db.tar.gz
org.eclipse.tcf-fcc67d234b1665c188a07c53c2aa3779a76a95db.tar.xz
org.eclipse.tcf-fcc67d234b1665c188a07c53c2aa3779a76a95db.zip
TCF Debugger: fixed: the debugger disconnected with JSON syntax error exception while adding the symbol files and selecting them
-rw-r--r--plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/commands/MemoryMapWidget.java2
-rw-r--r--plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/model/TCFNodeExecContext.java2
2 files changed, 2 insertions, 2 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 6ec4799e2..507197b97 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
@@ -888,7 +888,7 @@ public class MemoryMapWidget {
}
private String getSymbolFileInfo(final IMemoryMap.MemoryRegion r) {
- if (channel == null || channel.getState() != IChannel.STATE_OPEN || r == null) return null;
+ if (channel == null || channel.getState() != IChannel.STATE_OPEN || r == null || r.getAddress() == null) return null;
try {
return new TCFTask<String>(channel) {
public void run() {
diff --git a/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/model/TCFNodeExecContext.java b/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/model/TCFNodeExecContext.java
index 1d2f0aef8..e02f7b144 100644
--- a/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/model/TCFNodeExecContext.java
+++ b/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/model/TCFNodeExecContext.java
@@ -560,7 +560,7 @@ public class TCFNodeExecContext extends TCFNode implements ISymbolOwner, ITCFExe
}
public TCFDataCache<TCFSymFileRef> getSymFileInfo(final BigInteger addr) {
- if (isDisposed()) return null;
+ if (addr == null || isDisposed()) return null;
TCFDataCache<TCFSymFileRef> ref_cache;
if (syms_info_lookup_cache != null) {
ref_cache = syms_info_lookup_cache.get(addr);

Back to the top