From b1fe465e4fe83c5c6445cb96d7cdedea0b885081 Mon Sep 17 00:00:00 2001
From: Thomas <>
Date: Thu, 15 Sep 2022 18:48:18 +0200
Subject: feat(moa-sig): only re-initialize MOA-Sig if PKI module is not marked
 as configurated

---
 .../modules/sigverify/moasig/impl/AbstractSignatureService.java    | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'eaaf_modules/eaaf_module_moa-sig')

diff --git a/eaaf_modules/eaaf_module_moa-sig/src/main/java/at/gv/egiz/eaaf/modules/sigverify/moasig/impl/AbstractSignatureService.java b/eaaf_modules/eaaf_module_moa-sig/src/main/java/at/gv/egiz/eaaf/modules/sigverify/moasig/impl/AbstractSignatureService.java
index e12ba63e..95ea3144 100644
--- a/eaaf_modules/eaaf_module_moa-sig/src/main/java/at/gv/egiz/eaaf/modules/sigverify/moasig/impl/AbstractSignatureService.java
+++ b/eaaf_modules/eaaf_module_moa-sig/src/main/java/at/gv/egiz/eaaf/modules/sigverify/moasig/impl/AbstractSignatureService.java
@@ -18,6 +18,7 @@ import at.gv.egovernment.moa.spss.server.transaction.TransactionContext;
 import at.gv.egovernment.moa.spss.server.transaction.TransactionContextManager;
 import at.gv.egovernment.moaspss.logging.LoggingContext;
 import at.gv.egovernment.moaspss.logging.LoggingContextManager;
+import iaik.pki.PKIFactory;
 
 public abstract class AbstractSignatureService {
   private static final Logger log = LoggerFactory.getLogger(AbstractSignatureService.class);
@@ -73,7 +74,11 @@ public abstract class AbstractSignatureService {
 
     }
 
-    IaikConfigurator.configure(moaSigConfig.getConfigHolder().getMoaSpssConfig());
+    if (!PKIFactory.getInstance().isAlreadyConfigured()) {
+      log.info("IAIK PKI Module is NOT configurated. Starting configuration again ... ");
+      IaikConfigurator.configure(moaSigConfig.getConfigHolder().getMoaSpssConfig());
+      
+    }
 
   }
 
-- 
cgit v1.2.3