From 2100733244c5319689d3c3833d8783158ce329b6 Mon Sep 17 00:00:00 2001
From: Marc Khouzam <marc.khouzam@ericsson.com>
Date: Fri, 11 Jul 2008 13:32:13 +0000
Subject: [PATCH] Bug 240380 Add the missing DsfServicesTracker.dispose() calls

---
 .../ui/viewmodel/modules/detail/ModuleDetailPane.java           | 1 +
 .../viewmodel/numberformat/detail/NumberFormatDetailPane.java   | 1 +
 .../src/org/eclipse/dd/tests/gdb/MIBreakpointsTest.java         | 1 +
 .../src/org/eclipse/dd/tests/gdb/MIRegistersTest.java           | 1 +
 .../src/org/eclipse/dd/tests/gdb/framework/SyncUtil.java        | 2 ++
 5 files changed, 6 insertions(+)

diff --git a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/modules/detail/ModuleDetailPane.java b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/modules/detail/ModuleDetailPane.java
index de5434f1f3c..a8cecb681a4 100644
--- a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/modules/detail/ModuleDetailPane.java
+++ b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/modules/detail/ModuleDetailPane.java
@@ -490,6 +490,7 @@ public class ModuleDetailPane extends ModulesAbstractDetailPane implements IAdap
              */
             DsfServicesTracker tracker = new DsfServicesTracker(DsfDebugUIPlugin.getBundleContext(), fDmc.getSessionId());
             IModules service = tracker.getService(IModules.class);
+            tracker.dispose();
             if (service == null) {
                 rm .setStatus(new Status(IStatus.ERROR, DsfDebugUIPlugin.PLUGIN_ID, IDsfStatusConstants.INVALID_STATE, "Service unavailable", null)); //$NON-NLS-1$
                 rm.done();
diff --git a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/ui/viewmodel/numberformat/detail/NumberFormatDetailPane.java b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/ui/viewmodel/numberformat/detail/NumberFormatDetailPane.java
index ccc3935196a..640e054d101 100644
--- a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/ui/viewmodel/numberformat/detail/NumberFormatDetailPane.java
+++ b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/ui/viewmodel/numberformat/detail/NumberFormatDetailPane.java
@@ -549,6 +549,7 @@ public class NumberFormatDetailPane implements IDetailPane, IAdaptable, IPropert
                             }
                         }
                     }
+                    tracker.dispose();
                     
                     /*
                      *  We need to wait until all the values are in. This causes the work
diff --git a/plugins/org.eclipse.dd.tests.gdb/src/org/eclipse/dd/tests/gdb/MIBreakpointsTest.java b/plugins/org.eclipse.dd.tests.gdb/src/org/eclipse/dd/tests/gdb/MIBreakpointsTest.java
index c906aa2e66a..c88dacfdc97 100644
--- a/plugins/org.eclipse.dd.tests.gdb/src/org/eclipse/dd/tests/gdb/MIBreakpointsTest.java
+++ b/plugins/org.eclipse.dd.tests.gdb/src/org/eclipse/dd/tests/gdb/MIBreakpointsTest.java
@@ -199,6 +199,7 @@ public class MIBreakpointsTest extends BaseTestCase {
         fRunControl.getSession().removeServiceEventListener(MIBreakpointsTest.this);
         fBreakpointService = null;
         fRunControl = null;
+        fServicesTracker.dispose();
         fServicesTracker = null;
 
         clearEventCounters();
diff --git a/plugins/org.eclipse.dd.tests.gdb/src/org/eclipse/dd/tests/gdb/MIRegistersTest.java b/plugins/org.eclipse.dd.tests.gdb/src/org/eclipse/dd/tests/gdb/MIRegistersTest.java
index 6b956fe583d..d6dad0fb17f 100644
--- a/plugins/org.eclipse.dd.tests.gdb/src/org/eclipse/dd/tests/gdb/MIRegistersTest.java
+++ b/plugins/org.eclipse.dd.tests.gdb/src/org/eclipse/dd/tests/gdb/MIRegistersTest.java
@@ -85,6 +85,7 @@ public class MIRegistersTest extends BaseTestCase {
 
 	@After
 	public void tearDown() {
+		fServicesTracker.dispose();
 		fRegService = null;
 	}
 
diff --git a/plugins/org.eclipse.dd.tests.gdb/src/org/eclipse/dd/tests/gdb/framework/SyncUtil.java b/plugins/org.eclipse.dd.tests.gdb/src/org/eclipse/dd/tests/gdb/framework/SyncUtil.java
index 260e9ca1b18..ac57fb9e6cd 100644
--- a/plugins/org.eclipse.dd.tests.gdb/src/org/eclipse/dd/tests/gdb/framework/SyncUtil.java
+++ b/plugins/org.eclipse.dd.tests.gdb/src/org/eclipse/dd/tests/gdb/framework/SyncUtil.java
@@ -71,6 +71,8 @@ public class SyncUtil {
 		fRunControl = tracker.getService(MIRunControl.class);
 		fStack = tracker.getService(MIStack.class);
 		fExpressions = tracker.getService(IExpressions.class);
+		
+		tracker.dispose();
 	}
 
 	public static MIStoppedEvent SyncStep(final StepType stepType, int numSteps) throws Throwable {