Bug 508542 - Failures for testBug490902 in I-buildsY20161208-1000S4_7_0_M4I20161213-0600I20161213-0300I20161212-2000I20161211-2000I20161210-2000I20161208-0830I20161208-0730I20161207-2000I20161207-1340I20161207-0800I20161207-0515I20161206-2000I20161206-0800I20161205-2000I20161205-0800I20161204-2000I20161203-2000I20161202-2000I20161201-2000

Change-Id: I4f75a52880f235675b9446415b2d2297c266c4d9
Signed-off-by: Thomas Watson <tjwatson@us.ibm.com>

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();
 		}
 	}