Fix NPE in CMSEngine.shutdown()

dogtagpki · Jun 9, 2023 · 4298a66 · 4298a66
1 parent 0d324ac
commit 4298a66
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/base/server/src/main/java/com/netscape/cmscore/apps/CMSEngine.java b/base/server/src/main/java/com/netscape/cmscore/apps/CMSEngine.java
@@ -1371,20 +1371,22 @@ public void shutdownAuthzSubsystem() {
     }
 
     public void shutdownAuthSubsystem() {
-        if (authSubsystem != null) {
-            authSubsystem.shutdown();
-        }
+        if (authSubsystem == null) return;
+        authSubsystem.shutdown();
     }
 
     public void shutdownRequestSubsystem() {
+        if (requestSubsystem == null) return;
         requestSubsystem.shutdown();
     }
 
     public void shutdownX500NameSubsystem() {
+        if (x500NameSubsystem == null) return;
         x500NameSubsystem.shutdown();
     }
 
     public void shutdownOIDLoaderSubsystem() {
+        if (oidLoaderSubsystem == null) return;
         oidLoaderSubsystem.shutdown();
     }
 
@@ -1399,17 +1401,20 @@ public void shutdownDBSubsystem() {
     }
 
     public void shutdownJSSSubsystem() {
+        if (jssSubsystem == null) return;
         jssSubsystem.shutdown();
     }
 
     public void shutdownLogSubsystem() {
+        if (logSubsystem == null) return;
         logSubsystem.shutdown();
     }
 
     public void shutdownDatabase() {
     }
 
     public void shutdownPluginRegistry() {
+        if (pluginRegistry == null) return;
         pluginRegistry.shutdown();
     }