Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUwe Stieber2012-09-19 12:00:06 -0400
committerUwe Stieber2012-09-20 06:11:29 -0400
commit5aff6c3d8ad3c4825ca5d3db9d27a6026b2eed9f (patch)
tree066c5dcd7112c4bab1310772c1c4acefdca1285e
parent8cbf38809424e597d40f1c67a553f43e38cdcfdf (diff)
downloadorg.eclipse.tcf-5aff6c3d8ad3c4825ca5d3db9d27a6026b2eed9f.tar.gz
org.eclipse.tcf-5aff6c3d8ad3c4825ca5d3db9d27a6026b2eed9f.tar.xz
org.eclipse.tcf-5aff6c3d8ad3c4825ca5d3db9d27a6026b2eed9f.zip
TCF Debugger: Fix some additional cases to protect the TCFModelProxy from accessing the expanded_nodes TreeMap with a null key.
-rw-r--r--plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/model/TCFModelProxy.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/model/TCFModelProxy.java b/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/model/TCFModelProxy.java
index 8c2619756..a9f40d364 100644
--- a/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/model/TCFModelProxy.java
+++ b/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/model/TCFModelProxy.java
@@ -334,7 +334,7 @@ public class TCFModelProxy extends AbstractModelProxy implements IModelProxy, Ru
}
else {
expand = Boolean.TRUE;
- expanded_nodes.put(id, is_linux);
+ if (id != null) expanded_nodes.put(id, is_linux);
}
}
}
@@ -345,7 +345,7 @@ public class TCFModelProxy extends AbstractModelProxy implements IModelProxy, Ru
* Clear auto-expand info when a node is removed.
*/
void clearAutoExpandStack(String id) {
- expanded_nodes.remove(id) ;
+ if (id != null) expanded_nodes.remove(id) ;
}
/**

Back to the top