From 7cc3de7acf2a377cf916372b9b6763e130917ef9 Mon Sep 17 00:00:00 2001 From: Marc Khouzam Date: Mon, 10 Sep 2012 11:11:14 -0400 Subject: [PATCH] Bug 389097: [breakpoints] Disabled state of Catchpoints at creation is ignored Change-Id: I1c30fb7937ed4e35f22e18f7665c1daf5145ba37 Reviewed-on: https://git.eclipse.org/r/7699 Reviewed-by: John Cortell IP-Clean: John Cortell Reviewed-by: Marc Khouzam IP-Clean: Marc Khouzam Tested-by: Marc Khouzam --- .../src/org/eclipse/cdt/dsf/mi/service/MIBreakpoints.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIBreakpoints.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIBreakpoints.java index b24cd9468f1..dcf41fb7361 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIBreakpoints.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIBreakpoints.java @@ -839,16 +839,12 @@ public class MIBreakpoints extends AbstractDsfService implements IBreakpoints, I // Flag the event getSession().dispatchEvent(new BreakpointAddedEvent(dmc), getProperties()); - // Break/Watch/Catchpoints that are disabled when set are delayed (we - // don't tell gdb about them until the user enables them). So, we shouldn't - // be here if this is a disabled breakpoint - assert ((Boolean)getProperty(attributes, IS_ENABLED, true)) == true; - - // Condition, ignore count and cannot be specified at creation time. + // Condition, ignore count and state cannot be specified at creation time. // Therefore, we have to update the catchpoint if any of these is present Map delta = new HashMap(); delta.put(CONDITION, getProperty(attributes, CONDITION, NULL_STRING)); delta.put(IGNORE_COUNT, getProperty(attributes, IGNORE_COUNT, 0 )); + delta.put(IS_ENABLED, getProperty(attributes, IS_ENABLED, true)); modifyBreakpoint(dmc, delta, rm, false); }