From 52163463749e7d60dd0c29596801864a765b4c56 Mon Sep 17 00:00:00 2001 From: Teodor Madan Date: Thu, 17 Apr 2014 12:04:06 +0300 Subject: [PATCH] Bug 432988 - Breakpoint Log action cannot evaluate expression at breakpoint suspend event Use suspend context instead of breakpoint context for evaluating expression Change-Id: I8376baf8dc7efe5f5ad2a3254c29b841ae9940ba Signed-off-by: Teodor Madan Reviewed-on: https://git.eclipse.org/r/25185 Reviewed-by: Marc Khouzam Tested-by: Hudson CI --- .../mi/service/breakpoint/actions/MILogActionEnabler.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/breakpoint/actions/MILogActionEnabler.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/breakpoint/actions/MILogActionEnabler.java index c5e37bbd070..3198814b7b6 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/breakpoint/actions/MILogActionEnabler.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/breakpoint/actions/MILogActionEnabler.java @@ -17,11 +17,9 @@ import org.eclipse.cdt.debug.core.breakpointactions.ILogActionEnabler; import org.eclipse.cdt.dsf.concurrent.DataRequestMonitor; import org.eclipse.cdt.dsf.concurrent.DsfExecutor; import org.eclipse.cdt.dsf.concurrent.Query; -import org.eclipse.cdt.dsf.datamodel.DMContexts; import org.eclipse.cdt.dsf.datamodel.IDMContext; import org.eclipse.cdt.dsf.debug.service.IExpressions; import org.eclipse.cdt.dsf.debug.service.IFormattedValues; -import org.eclipse.cdt.dsf.debug.service.IBreakpoints.IBreakpointsTargetDMContext; import org.eclipse.cdt.dsf.debug.service.IExpressions.IExpressionDMContext; import org.eclipse.cdt.dsf.debug.service.IFormattedValues.FormattedValueDMContext; import org.eclipse.cdt.dsf.debug.service.IFormattedValues.FormattedValueDMData; @@ -34,12 +32,12 @@ public class MILogActionEnabler implements ILogActionEnabler { private final DsfExecutor fExecutor; private final DsfServicesTracker fServiceTracker; - private final IBreakpointsTargetDMContext fContext; + private final IDMContext fContext; public MILogActionEnabler(DsfExecutor executor, DsfServicesTracker serviceTracker, IDMContext context) { fExecutor = executor; fServiceTracker = serviceTracker; - fContext = DMContexts.getAncestorOfType(context, IBreakpointsTargetDMContext.class); + fContext = context; } @Override