Bug 310400 - o.e.update.configurator BundleException on stop at end of Unittests
diff --git a/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/ConfigurationActivator.java b/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/ConfigurationActivator.java
index 367978e..2a32318 100644
--- a/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/ConfigurationActivator.java
+++ b/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/ConfigurationActivator.java
@@ -65,7 +65,13 @@
context = ctx;
loadOptions();
acquireFrameworkLogService();
- initialize();
+ try {
+ initialize();
+ } catch (Exception e) {
+ //we failed to start, so make sure Utils closes its service trackers
+ Utils.shutdown();
+ throw e;
+ }
//Short cut, if the configuration has not changed
if (canRunWithCachedData()) {
@@ -525,7 +531,7 @@
return configurator;
}
- private void acquireFrameworkLogService() throws Exception {
+ private void acquireFrameworkLogService() {
ServiceReference logServiceReference = context.getServiceReference(FrameworkLog.class.getName());
if (logServiceReference == null)
return;
