summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario Pierro2012-10-02 23:54:53 (EDT)
committerPawel Piech2012-10-02 23:57:52 (EDT)
commit474f8b9f37a4bdf38ced38d3ca0da67b9e95ad31 (patch)
treee72681fcff9860b4733faa882760e54c60443d00
parent5e681bbe505074e4f79681a1201b4eac1c9ab281 (diff)
downloadorg.eclipse.cdt-474f8b9f37a4bdf38ced38d3ca0da67b9e95ad31.zip
org.eclipse.cdt-474f8b9f37a4bdf38ced38d3ca0da67b9e95ad31.tar.gz
org.eclipse.cdt-474f8b9f37a4bdf38ced38d3ca0da67b9e95ad31.tar.bz2
Bug 390979 - NullPointerException in BreakpointsMediator2.getPlatformBreakpoint()
-rw-r--r--dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/BreakpointsMediator2.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/BreakpointsMediator2.java b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/BreakpointsMediator2.java
index 035a419..7d2e4ed 100644
--- a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/BreakpointsMediator2.java
+++ b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/BreakpointsMediator2.java
@@ -483,9 +483,11 @@ public class BreakpointsMediator2 extends AbstractDsfService implements IBreakpo
for(Map.Entry<IBreakpoint, List<ITargetBreakpointInfo>> e: platformBPs.entrySet())
{
// Stop at the first occurrence
- for (ITargetBreakpointInfo tbp : e.getValue())
- if(tbp.getTargetBreakpoint().equals(bp))
+ for (ITargetBreakpointInfo tbp : e.getValue()) {
+ IBreakpointDMContext targetBreakpoint = tbp.getTargetBreakpoint();
+ if(targetBreakpoint != null && targetBreakpoint.equals(bp))
return e.getKey();
+ }
}
}
}