Bug 508542 - Failures for testBug490902 in I-builds
Change-Id: I4f75a52880f235675b9446415b2d2297c266c4d9
Signed-off-by: Thomas Watson <tjwatson@us.ibm.com>
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/BundleInstaller.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/BundleInstaller.java
index 16b5971..7a6aafd 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/BundleInstaller.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/BundleInstaller.java
@@ -127,7 +127,7 @@
return bundle;
}
- synchronized public Bundle[] uninstallAllBundles() throws BundleException {
+ synchronized public Bundle[] uninstallAllBundles() {
if (bundles == null)
return null;
ArrayList result = new ArrayList(bundles.size());
@@ -137,6 +137,9 @@
bundle.uninstall();
} catch (IllegalStateException e) {
// ignore; bundle probably already uninstalled
+ } catch (BundleException e) {
+ // ignore and move on, but print stacktrace for logs
+ e.printStackTrace();
}
result.add(bundle);
}
@@ -144,7 +147,7 @@
return (Bundle[]) result.toArray(new Bundle[result.size()]);
}
- synchronized public Bundle[] shutdown() throws BundleException {
+ synchronized public Bundle[] shutdown() {
if (bundles == null)
return null;
Bundle[] result = uninstallAllBundles();
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/SystemBundleTests.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/SystemBundleTests.java
index 89d0aa3..e6707c4 100755
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/SystemBundleTests.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/SystemBundleTests.java
@@ -1567,11 +1567,7 @@
}
assertEquals("Wrong state for SystemBundle", Bundle.RESOLVED, equinox.getState()); //$NON-NLS-1$
} finally {
- try {
- testBundleInstaller.shutdown();
- } catch (BundleException e) {
- fail("Could not shutdown installer", e);
- }
+ testBundleInstaller.shutdown();
}
}
