|
Lines 1-5
Link Here
|
| 1 |
/******************************************************************************* |
1 |
/******************************************************************************* |
| 2 |
* Copyright (c) 2004, 2009 QNX Software Systems and others. |
2 |
* Copyright (c) 2004, 2011 QNX Software Systems and others. |
| 3 |
* All rights reserved. This program and the accompanying materials |
3 |
* All rights reserved. This program and the accompanying materials |
| 4 |
* are made available under the terms of the Eclipse Public License v1.0 |
4 |
* are made available under the terms of the Eclipse Public License v1.0 |
| 5 |
* which accompanies this distribution, and is available at |
5 |
* which accompanies this distribution, and is available at |
|
Lines 7-12
Link Here
|
| 7 |
* |
7 |
* |
| 8 |
* Contributors: |
8 |
* Contributors: |
| 9 |
* QNX Software Systems - Initial API and implementation |
9 |
* QNX Software Systems - Initial API and implementation |
|
|
10 |
* Marc Khouzam (Ericsson) - Check for a null threadId (Bug 356463) |
| 10 |
*******************************************************************************/ |
11 |
*******************************************************************************/ |
| 11 |
package org.eclipse.cdt.dsf.gdb.internal.ui.breakpoints; |
12 |
package org.eclipse.cdt.dsf.gdb.internal.ui.breakpoints; |
| 12 |
|
13 |
|
|
Lines 474-480
Link Here
|
| 474 |
new DataRequestMonitor<IThreadDMData>(ImmediateExecutor.getInstance(), rm) { |
475 |
new DataRequestMonitor<IThreadDMData>(ImmediateExecutor.getInstance(), rm) { |
| 475 |
@Override |
476 |
@Override |
| 476 |
public void handleSuccess() { |
477 |
public void handleSuccess() { |
| 477 |
rm.setData(getData().getName()); |
478 |
final StringBuilder builder = new StringBuilder(getData().getName()); |
|
|
479 |
String containerId = getData().getId(); |
| 480 |
if (containerId != null) { |
| 481 |
builder.append(" ["); //$NON-NLS-1$ |
| 482 |
builder.append(containerId); |
| 483 |
builder.append("]"); //$NON-NLS-1$ |
| 484 |
} |
| 485 |
|
| 486 |
rm.setData(builder.toString()); |
| 478 |
rm.done(); |
487 |
rm.done(); |
| 479 |
} |
488 |
} |
| 480 |
}); |
489 |
}); |
|
Lines 524-531
Link Here
|
| 524 |
builder.append("["); //$NON-NLS-1$ |
533 |
builder.append("["); //$NON-NLS-1$ |
| 525 |
builder.append(((IMIExecutionDMContext)thread).getThreadId()); |
534 |
builder.append(((IMIExecutionDMContext)thread).getThreadId()); |
| 526 |
builder.append("] "); //$NON-NLS-1$ |
535 |
builder.append("] "); //$NON-NLS-1$ |
| 527 |
builder.append(getData().getId()); |
536 |
String threadId = getData().getId(); |
| 528 |
builder.append(getData().getName()); |
537 |
if (threadId != null) { |
|
|
538 |
builder.append(threadId); |
| 539 |
} |
| 540 |
String threadName = getData().getName(); |
| 541 |
if (threadName != null) { |
| 542 |
builder.append(threadName); |
| 543 |
} |
| 529 |
|
544 |
|
| 530 |
rm.setData(builder.toString()); |
545 |
rm.setData(builder.toString()); |
| 531 |
rm.done(); |
546 |
rm.done(); |
