diff options
-rw-r--r-- | bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/BundleInstaller.java | 7 | ||||
-rwxr-xr-x | bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/SystemBundleTests.java | 6 |
2 files changed, 6 insertions, 7 deletions
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 16b5971f3..7a6aafd10 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 @@ public class BundleInstaller { 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 @@ public class BundleInstaller { 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 @@ public class BundleInstaller { 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 89d0aa376..e6707c409 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 @@ public class SystemBundleTests extends AbstractBundleTests { } 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(); } } |