Improve failed startup follow-up exceptions and back to OWB snapshot (#…

…1093)
apache · Jan 16, 2024 · 728aab6 · 728aab6
1 parent be59561
commit 728aab6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/pom.xml b/pom.xml
@@ -218,7 +218,7 @@
     <version.johnzon>2.0.0</version.johnzon>
     <version.myfaces>4.0.1</version.myfaces>
     <version.openjpa>4.0.0-SNAPSHOT</version.openjpa>
-    <version.openwebbeans>4.0.1</version.openwebbeans>
+    <version.openwebbeans>4.0.2-SNAPSHOT</version.openwebbeans>
     <!-- org.eclipse -->
     <version.eclipselink>3.0.4</version.eclipselink>
     <!-- org.glassfish -->

diff --git a/...le/mp-common/src/main/java/org/apache/tomee/microprofile/health/MPHealthCDIExtension.java b/...le/mp-common/src/main/java/org/apache/tomee/microprofile/health/MPHealthCDIExtension.java
@@ -121,6 +121,11 @@ private void addHealthChecks(
      * Remove all the instances of {@link HealthCheck} from the {@link MicroProfileHealthReporter}.
      */
     public void beforeShutdown(@Observes final BeforeShutdown bs) {
+        // in case when CDI startup failed
+        if (reporter == null)
+        {
+            return;
+        }
         removeHealthCheck(livenessChecks, reporter::removeLivenessCheck);
         removeHealthCheck(readinessChecks, reporter::removeReadinessCheck);
         removeHealthCheck(startupChecks, reporter::removeStartupCheck);
@@ -182,4 +187,4 @@ public HealthCheckResponse call() {
                 .build();
         }
     }
-}
+}