Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEugene Tarassov2013-01-11 22:19:59 +0000
committerEugene Tarassov2013-01-11 22:19:59 +0000
commit76106adce258dd42f976a54b33dee62f3ce229e0 (patch)
tree56c36de9f6e75ac20e78f13f3df8f32264068fa0 /plugins
parente2139e4b9ea684b9ca51b8abbf95f228d63ec673 (diff)
downloadorg.eclipse.tcf-76106adce258dd42f976a54b33dee62f3ce229e0.tar.gz
org.eclipse.tcf-76106adce258dd42f976a54b33dee62f3ce229e0.tar.xz
org.eclipse.tcf-76106adce258dd42f976a54b33dee62f3ce229e0.zip
TCF Debugger: fixed NPE in the Symbol Files dialog when last entry is removed
Diffstat (limited to 'plugins')
-rw-r--r--plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/commands/MemoryMapWidget.java7
1 files changed, 4 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 1eee8a029..1bf1c3350 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
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011, 2012 Wind River Systems, Inc. and others.
+ * Copyright (c) 2011, 2013 Wind River Systems, Inc. and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -601,8 +601,9 @@ public class MemoryMapWidget {
if (r == null) return false;
String f0 = r.getFileName();
BigInteger a0 = JSON.toBigInteger(r.getAddress());
- if (a0 != null)
- for (IMemoryMap.MemoryRegion c : cur_maps.get(selected_mem_map_id)) {
+ ArrayList<IMemoryMap.MemoryRegion> map = cur_maps.get(selected_mem_map_id);
+ if (map == null) return false;
+ for (IMemoryMap.MemoryRegion c : map) {
String f1 = c.getFileName();
if (f0 != f1) {
if (f0 == null) continue;

Back to the top