mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-15 13:05:22 +02:00
Code Issues Wiki Activity

Bug 409006 - [visualizer] NPE when closing visualizer with nothing

Browse source 
selected in debug view

Change-Id: If1c7fdbdd08822175e83eebc9fcd51b6bd859aae
Reviewed-on: https://git.eclipse.org/r/13950
Reviewed-by: William Swanson <traveler@tilera.com>
IP-Clean: William Swanson <traveler@tilera.com>
Tested-by: William Swanson <traveler@tilera.com>
This commit is contained in:
Marc Dumais 2013-06-20 09:34:59 -04:00 • committed by Marc Khouzam
parent f02d888142
commit 06f0d1af10
1 changed files with 35 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/view/MulticoreVisualizer.java
View file

@ -12,6 +12,7 @@
* Marc Dumais (Ericsson) - Add CPU/core load information to the multicore visualizer (Bug 396268)
* Marc Dumais (Ericsson) - Bug 399419
* Marc Dumais (Ericsson) - Bug 405390
* Marc Dumais (Ericsson) - Bug 409006
*******************************************************************************/
package org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.ui.view;
@ -817,45 +818,46 @@ public class MulticoreVisualizer extends GraphicCanvasVisualizer
List<Object> items = SelectionUtils.getSelectedObjects(workbenchSelection);
// Use the current canvas model to match Debug View items
// with corresponding threads, if any.
VisualizerModel model = m_canvas.getModel();
if (model != null) {
if (m_canvas != null) {
// Use the current canvas model to match Debug View items
// with corresponding threads, if any.
VisualizerModel model = m_canvas.getModel();
if (model != null) {
Set<Object> selected = new HashSet<Object>();
Set<Object> selected = new HashSet<Object>();
for (Object item : items) {
for (Object item : items) {
// Currently, we ignore selections other than DSF context objects.
// TODO: any other cases where we could map selections to canvas?
if (item instanceof IDMVMContext)
{
IDMContext context = ((IDMVMContext) item).getDMContext();
// Currently, we ignore selections other than DSF context objects.
// TODO: any other cases where we could map selections to canvas?
if (item instanceof IDMVMContext)
{
IDMContext context = ((IDMVMContext) item).getDMContext();
IMIProcessDMContext processContext =
DMContexts.getAncestorOfType(context, IMIProcessDMContext.class);
int pid = Integer.parseInt(processContext.getProcId());
IMIProcessDMContext processContext =
DMContexts.getAncestorOfType(context, IMIProcessDMContext.class);
int pid = Integer.parseInt(processContext.getProcId());
IMIExecutionDMContext execContext =
DMContexts.getAncestorOfType(context, IMIExecutionDMContext.class);
int tid = (execContext == null) ? 0 : execContext.getThreadId();
IMIExecutionDMContext execContext =
DMContexts.getAncestorOfType(context, IMIExecutionDMContext.class);
int tid = (execContext == null) ? 0 : execContext.getThreadId();
if (tid == 0) { // process
List<VisualizerThread> threads = model.getThreadsForProcess(pid);
if (threads != null) {
selected.addAll(threads);
if (tid == 0) { // process
List<VisualizerThread> threads = model.getThreadsForProcess(pid);
if (threads != null) {
selected.addAll(threads);
}
}
}
else { // thread
VisualizerThread thread = model.getThread(tid);
if (thread != null) {
selected.add(thread);
else { // thread
VisualizerThread thread = model.getThread(tid);
if (thread != null) {
selected.add(thread);
}
}
}
}
visualizerSelection = SelectionUtils.toSelection(selected);
}
visualizerSelection = SelectionUtils.toSelection(selected);
}
return visualizerSelection;