From a5bf184c77d092a2319821583b84ba77afb4ddde Mon Sep 17 00:00:00 2001 From: Alexander Fedorov Date: Sat, 4 Jan 2025 19:25:19 +0300 Subject: [PATCH] [#942] GDBControl discards ILaunchConfiguration in its constructor add protected final field to be available for successors adding final accessor method may break Embedded CDT --- dsf-gdb/org.eclipse.cdt.dsf.gdb/META-INF/MANIFEST.MF | 2 +- .../org/eclipse/cdt/dsf/gdb/service/command/GDBControl.java | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/META-INF/MANIFEST.MF b/dsf-gdb/org.eclipse.cdt.dsf.gdb/META-INF/MANIFEST.MF index 07c0232fef3..909e9ad46a8 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/META-INF/MANIFEST.MF +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-SymbolicName: org.eclipse.cdt.dsf.gdb;singleton:=true -Bundle-Version: 7.1.500.qualifier +Bundle-Version: 7.2.0.qualifier Bundle-Activator: org.eclipse.cdt.dsf.gdb.internal.GdbPlugin Bundle-Localization: plugin Require-Bundle: org.eclipse.core.runtime, diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/command/GDBControl.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/command/GDBControl.java index 3ccc8573d2f..064c5bfad99 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/command/GDBControl.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/command/GDBControl.java @@ -112,6 +112,11 @@ public class GDBControl extends AbstractMIControl implements IGDBControl { private static final int STATUS_CODE_COMMAND_TIMED_OUT = 20100; + /** + * @since 7.2 + */ + protected final ILaunchConfiguration config; + /** * Event indicating that the back end process has started. */ @@ -240,6 +245,7 @@ public GDBControl(DsfSession session, ILaunchConfiguration config, CommandFactor protected GDBControl(DsfSession session, boolean useThreadAndFrameOptions, ILaunchConfiguration config, CommandFactory factory) { super(session, useThreadAndFrameOptions, factory); + this.config = config; } @Override