Refactor OCSPEngine.initSubsystem()

The code in OCSPEngine.initSubsystem() that initializes the OCSP authority has been moved into initSubsystems().
dogtagpki · Feb 1, 2024 · 02c0413 · 02c0413
1 parent 5c0ba66
commit 02c0413
Showing 1 changed file with 19 additions and 6 deletions.
diff --git a/base/ocsp/src/main/java/org/dogtagpki/server/ocsp/OCSPEngine.java b/base/ocsp/src/main/java/org/dogtagpki/server/ocsp/OCSPEngine.java
@@ -82,21 +82,34 @@ public void initDBSubsystem() throws Exception {
         dbSubsystem.setCMSEngine(this);
         dbSubsystem.setEngineConfig(config);
     }
+
+    @Override
+    public void initSubsystems() throws Exception {
+
+        OCSPEngineConfig engineConfig = getConfig();
+        OCSPConfig ocspConfig = engineConfig.getOCSPConfig();
+
+        OCSPAuthority authority = (OCSPAuthority) subsystems.get(OCSPAuthority.ID);
+        authority.init(ocspConfig);
+
+        if (!isPreOpMode()) {
+            authority.startup();
+        }
+
+        super.initSubsystems();
+    }
+
     @Override
     public void initSubsystem(Subsystem subsystem, ConfigStore subsystemConfig) throws Exception {
 
         if (subsystem instanceof OCSPAuthority) {
-            // skip initialization during installation
-            if (isPreOpMode()) return;
+            // already initialized in initSubsystems()
+            return;
         }
 
         super.initSubsystem(subsystem, subsystemConfig);
-        if (subsystem instanceof OCSPAuthority) {
-            subsystem.startup();
-        }
     }
 
-
     @Override
     protected void startupSubsystems() throws Exception {