diff options
| author | Eugene Tarassov | 2016-04-22 16:47:14 +0000 |
|---|---|---|
| committer | Eugene Tarassov | 2016-04-22 16:47:14 +0000 |
| commit | aa44cad0038b7599d23604cfe7481d12f2cea384 (patch) | |
| tree | c8b9088c2084832739e918c089f64dce1c689be7 /plugins/org.eclipse.tcf.debug | |
| parent | eb371abc58af458dc88bb0749da22c465615a391 (diff) | |
| download | org.eclipse.tcf-aa44cad0038b7599d23604cfe7481d12f2cea384.tar.gz org.eclipse.tcf-aa44cad0038b7599d23604cfe7481d12f2cea384.tar.xz org.eclipse.tcf-aa44cad0038b7599d23604cfe7481d12f2cea384.zip | |
TCF Debugger: set SKIP_PROLOGUE breakpoint property only if it is not set already in the breakpoint marker
Diffstat (limited to 'plugins/org.eclipse.tcf.debug')
| -rw-r--r-- | plugins/org.eclipse.tcf.debug/src/org/eclipse/tcf/internal/debug/model/TCFBreakpointsModel.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/plugins/org.eclipse.tcf.debug/src/org/eclipse/tcf/internal/debug/model/TCFBreakpointsModel.java b/plugins/org.eclipse.tcf.debug/src/org/eclipse/tcf/internal/debug/model/TCFBreakpointsModel.java index 87ad33661..37269f8fd 100644 --- a/plugins/org.eclipse.tcf.debug/src/org/eclipse/tcf/internal/debug/model/TCFBreakpointsModel.java +++ b/plugins/org.eclipse.tcf.debug/src/org/eclipse/tcf/internal/debug/model/TCFBreakpointsModel.java @@ -80,6 +80,7 @@ public class TCFBreakpointsModel { ATTR_STOP_GROUP = ITCFConstants.ID_TCF_DEBUG_MODEL + '.' + IBreakpoints.PROP_STOP_GROUP, ATTR_CONTEXT_QUERY = ITCFConstants.ID_TCF_DEBUG_MODEL + '.' + IBreakpoints.PROP_CONTEXT_QUERY, ATTR_LINE_OFFSET = ITCFConstants.ID_TCF_DEBUG_MODEL + '.' + IBreakpoints.PROP_LINE_OFFSET, + ATTR_SKIP_PROLOGUE = ITCFConstants.ID_TCF_DEBUG_MODEL + '.' + IBreakpoints.PROP_SKIP_PROLOGUE, ATTR_EVENT_TYPE = "org.eclipse.cdt.debug.core.eventbreakpoint_event_id", ATTR_EVENT_ARGS = "org.eclipse.cdt.debug.core.eventbreakpoint_event_arg", ATTR_TYPE = "org.eclipse.cdt.debug.core.breakpointType", @@ -732,10 +733,10 @@ public class TCFBreakpointsModel { expr = expr.substring(0, paren); m.put(IBreakpoints.PROP_LOCATION, expr); } - if (capabilities != null) { + if (!m.containsKey(IBreakpoints.PROP_SKIP_PROLOGUE) && capabilities != null) { Object obj = capabilities.get(IBreakpoints.CAPABILITY_SKIP_PROLOGUE); if (obj instanceof Boolean && ((Boolean)obj).booleanValue()) { - m.put(IBreakpoints.PROP_SKIP_PROLOGUE, Boolean.TRUE); + m.put(IBreakpoints.PROP_SKIP_PROLOGUE, true); } } } |