mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-23 14:42:11 +02:00
Code Issues Wiki Activity

Bug 400023 - [launch] Services tracker not disposed in

Browse source 
FinalLaunchSequence_7_0

Change-Id: Iaeb915481316a6aa7c4899bb003a4e25d1f4c087
Reviewed-on: https://git.eclipse.org/r/10189
Reviewed-by: Mikhail Khodjaiants <mikhailkhod@googlemail.com>
IP-Clean: Mikhail Khodjaiants <mikhailkhod@googlemail.com>
Tested-by: Mikhail Khodjaiants <mikhailkhod@googlemail.com>
Reviewed-by: Marc Khouzam <marc.khouzam@ericsson.com>
IP-Clean: Marc Khouzam <marc.khouzam@ericsson.com>
Tested-by: Marc Khouzam <marc.khouzam@ericsson.com>
This commit is contained in:
Marc Khouzam 2013-02-05 16:14:26 -05:00
parent e3150dce7f
commit ffe8836c1b
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/FinalLaunchSequence_7_0.java
View file

@ -43,7 +43,6 @@ public class FinalLaunchSequence_7_0 extends FinalLaunchSequence {
private IGDBControl fCommandControl; private IGDBControl fCommandControl;
private CommandFactory fCommandFactory; private CommandFactory fCommandFactory;
private DsfServicesTracker fTracker;
private DsfSession fSession; private DsfSession fSession;
public FinalLaunchSequence_7_0(DsfSession session, Map<String, Object> attributes, RequestMonitorWithProgress rm) { public FinalLaunchSequence_7_0(DsfSession session, Map<String, Object> attributes, RequestMonitorWithProgress rm) {
@ -76,9 +75,10 @@ public class FinalLaunchSequence_7_0 extends FinalLaunchSequence {
*/ */
@Execute @Execute
public void stepInitializeFinalLaunchSequence_7_0(RequestMonitor rm) { public void stepInitializeFinalLaunchSequence_7_0(RequestMonitor rm) {
fTracker = new DsfServicesTracker(GdbPlugin.getBundleContext(), fSession.getId()); DsfServicesTracker tracker = new DsfServicesTracker(GdbPlugin.getBundleContext(), fSession.getId());
fCommandControl = tracker.getService(IGDBControl.class);
tracker.dispose();
fCommandControl = fTracker.getService(IGDBControl.class);
if (fCommandControl == null) { if (fCommandControl == null) {
rm.setStatus(new Status(IStatus.ERROR, GdbPlugin.PLUGIN_ID, -1, "Cannot obtain control service", null)); //$NON-NLS-1$ rm.setStatus(new Status(IStatus.ERROR, GdbPlugin.PLUGIN_ID, -1, "Cannot obtain control service", null)); //$NON-NLS-1$
rm.done(); rm.done();
@ -96,8 +96,6 @@ public class FinalLaunchSequence_7_0 extends FinalLaunchSequence {
*/ */
@RollBack("stepInitializeFinalLaunchSequence_7_0") @RollBack("stepInitializeFinalLaunchSequence_7_0")
public void rollBackInitializeFinalLaunchSequence_7_0(RequestMonitor rm) { public void rollBackInitializeFinalLaunchSequence_7_0(RequestMonitor rm) {
if (fTracker != null) fTracker.dispose();
fTracker = null;
rm.done(); rm.done();
} }