From ffe8836c1b7163e90535f99672feeb54f0ddd1c2 Mon Sep 17 00:00:00 2001 From: Marc Khouzam Date: Tue, 5 Feb 2013 16:14:26 -0500 Subject: [PATCH] Bug 400023 - [launch] Services tracker not disposed in FinalLaunchSequence_7_0 Change-Id: Iaeb915481316a6aa7c4899bb003a4e25d1f4c087 Reviewed-on: https://git.eclipse.org/r/10189 Reviewed-by: Mikhail Khodjaiants IP-Clean: Mikhail Khodjaiants Tested-by: Mikhail Khodjaiants Reviewed-by: Marc Khouzam IP-Clean: Marc Khouzam Tested-by: Marc Khouzam --- .../cdt/dsf/gdb/launching/FinalLaunchSequence_7_0.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/FinalLaunchSequence_7_0.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/FinalLaunchSequence_7_0.java index 0a03927b29c..c910204f01e 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/FinalLaunchSequence_7_0.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/FinalLaunchSequence_7_0.java @@ -43,7 +43,6 @@ public class FinalLaunchSequence_7_0 extends FinalLaunchSequence { private IGDBControl fCommandControl; private CommandFactory fCommandFactory; - private DsfServicesTracker fTracker; private DsfSession fSession; public FinalLaunchSequence_7_0(DsfSession session, Map attributes, RequestMonitorWithProgress rm) { @@ -76,9 +75,10 @@ public class FinalLaunchSequence_7_0 extends FinalLaunchSequence { */ @Execute 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) { rm.setStatus(new Status(IStatus.ERROR, GdbPlugin.PLUGIN_ID, -1, "Cannot obtain control service", null)); //$NON-NLS-1$ rm.done(); @@ -96,8 +96,6 @@ public class FinalLaunchSequence_7_0 extends FinalLaunchSequence { */ @RollBack("stepInitializeFinalLaunchSequence_7_0") public void rollBackInitializeFinalLaunchSequence_7_0(RequestMonitor rm) { - if (fTracker != null) fTracker.dispose(); - fTracker = null; rm.done(); }