Bug 560788 - Improve runtime exceptions out of the frameworkS4_16_0_M1I20200421-1800I20200420-1800I20200419-1800I20200418-1800I20200417-1800I20200416-1800I20200416-0410I20200415-1800I20200415-0620I20200415-0200I20200414-1010I20200414-0630I20200413-1800I20200412-1800I20200411-1800I20200411-0950I20200411-0720I20200411-0510I20200411-0300I20200410-2300I20200410-1800I20200409-0200I20200408-1800I20200408-0600I20200407-1800I20200407-1210I20200407-0120I20200406-1800I20200406-0600I20200406-0350I20200406-0120I20200405-1800I20200405-0600I20200404-1800I20200404-1220I20200404-0600I20200404-0330I20200403-1800I20200402-2250I20200402-1800I20200402-0850I20200402-0410I20200401-1800

Improve exception methods to include information about the bundle
related to the exception.  This is not an exhaustive change, but it does
improve many of the common error that can happen when a bundle is
uninstalled or a bundle context is invalid or a service is unregistered.

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

1 files changed, 4 insertions, 3 deletions

diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/FrameworkExtensionInstaller.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/FrameworkExtensionInstaller.java
index 5737b0c98..30137006d 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/FrameworkExtensionInstaller.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/FrameworkExtensionInstaller.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2013, 2017 IBM Corporation and others.
+ * Copyright (c) 2013, 2020 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -152,7 +152,7 @@ public class FrameworkExtensionInstaller {
 						callAddFilePathMethod(file);
 					}
 				} catch (InvocationTargetException | MalformedURLException e) {
-					throw new BundleException("Error adding extension content.", e); //$NON-NLS-1$
+					throw new BundleException("Error adding extension content. " + revision, e); //$NON-NLS-1$
 				}
 			}
 		}
@@ -268,7 +268,8 @@ public class FrameworkExtensionInstaller {
 		} catch (Throwable e) {
 			BundleException eventException;
 			if (activator == null) {
-				eventException = new BundleException(Msg.BundleContextImpl_LoadActivatorError, BundleException.ACTIVATOR_ERROR, e);
+				eventException = new BundleException(Msg.BundleContextImpl_LoadActivatorError + ' ' + extensionRevision,
+						BundleException.ACTIVATOR_ERROR, e);
 			} else {
 				eventException = new BundleException(NLS.bind(Msg.BUNDLE_ACTIVATOR_EXCEPTION, new Object[] {activator.getClass(), "start", extensionRevision.getSymbolicName()}), BundleException.ACTIVATOR_ERROR, e); //$NON-NLS-1$
 			}