1 files changed, 3 insertions, 7 deletions
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIBreakpointsManager.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIBreakpointsManager.java
index 58c4586481f..cdebdd9a1ee 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIBreakpointsManager.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIBreakpointsManager.java
@@ -1176,22 +1176,18 @@ public class MIBreakpointsManager extends AbstractDsfService implements IBreakpo
 
     @DsfServiceEventHandler
     public void eventDispatched(MIBreakpointHitEvent e) {
-        performBreakpointAction(e.getNumber());
+        performBreakpointAction(e.getDMContext(), e.getNumber());
     }
 
     @DsfServiceEventHandler
     public void eventDispatched(MIWatchpointTriggerEvent e) {
-        performBreakpointAction(e.getNumber());
+        performBreakpointAction(e.getDMContext(), e.getNumber());
     }
 
-    private void performBreakpointAction(int number) {
+    private void performBreakpointAction(final IDMContext context, int number) {
         // Identify the platform breakpoint
         final ICBreakpoint breakpoint = findPlatformBreakpoint(number);
 
-        // FIXME: (Bug228703) Temporary hack to have a context
-        Object[] contexts = fTargetBPs.keySet().toArray();
-        final IBreakpointsTargetDMContext context = (IBreakpointsTargetDMContext) contexts[0];
-
         // Perform the actions asynchronously (otherwise we can have a deadlock...)
         new Job("Breakpoint action") { //$NON-NLS-1$
             { setSystem(true); }