Check for null in case the framework is already shut down

eclipse-tycho · Sep 28, 2022 · b071d3b · b071d3b
1 parent acebd99
commit b071d3b
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/...sisu-osgi-connect/src/main/java/org/eclipse/sisu/osgi/connect/PlexusConnectFramework.java b/...sisu-osgi-connect/src/main/java/org/eclipse/sisu/osgi/connect/PlexusConnectFramework.java
@@ -226,8 +226,12 @@ public <T> T getService(Class<T> clazz, String filter) {
 	public Optional<Bundle> getBundle(Class<?> classFromBundle) {
 		URI location = getLocationFromClass(classFromBundle);
 		if (location != null) {
-			debug("Searching bundle for class " + classFromBundle + " and location " + location);
 			BundleContext bundleContext = getFramework().getBundleContext();
+			if (bundleContext == null) {
+				// already shut down
+				return Optional.empty();
+			}
+			debug("Searching bundle for class " + classFromBundle + " and location " + location);
 			Bundle[] bundles = bundleContext.getBundles();
 			for (Bundle bundle : bundles) {
 				String bundleLocation = bundle.getLocation();