From b071d3bca97d7767558c090d64d3c3444edd321d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20L=C3=A4ubrich?= <laeubi@laeubi-soft.de>
Date: Tue, 27 Sep 2022 18:41:56 +0200
Subject: [PATCH] Check for null in case the framework is already shut down

---
 .../eclipse/sisu/osgi/connect/PlexusConnectFramework.java   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/sisu-osgi/sisu-osgi-connect/src/main/java/org/eclipse/sisu/osgi/connect/PlexusConnectFramework.java b/sisu-osgi/sisu-osgi-connect/src/main/java/org/eclipse/sisu/osgi/connect/PlexusConnectFramework.java
index 00e9508640..b8e246a9f7 100644
--- a/sisu-osgi/sisu-osgi-connect/src/main/java/org/eclipse/sisu/osgi/connect/PlexusConnectFramework.java
+++ b/sisu-osgi/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();