aboutsummaryrefslogtreecommitdiff
path: root/spss.server
diff options
context:
space:
mode:
Diffstat (limited to 'spss.server')
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/IaikConfigurator.java7
1 files changed, 4 insertions, 3 deletions
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/IaikConfigurator.java b/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/IaikConfigurator.java
index a7ec91472..2508b7946 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/IaikConfigurator.java
+++ b/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/IaikConfigurator.java
@@ -58,10 +58,11 @@ public class IaikConfigurator {
// Set customized CRL retriever to overcome a classloader problem when MOA is deployed in Tomcat
RevocationSourceStore rss = RevocationFactory.getInstance(transId).getRevocationSourceStore();
rss.setRetriever(new CRLRetriever(), RevocationSourceTypes.CRL);
-
- dumpKeyEntryIDs();
+ if ((moaConfig.getSoftwareKeyModules().size() > 0) || (moaConfig.getHardwareKeyModules().size() > 0)) {
+ dumpKeyEntryIDs();
+ }
checkKeyGroupConfig(moaConfig);
- TrustStoreFactory.removeAllHandlers();
+ TrustStoreFactory.reset();
} catch (iaik.server.ConfigurationException e) {
throw new ConfigurationException("config.08", null, e);
} catch (Throwable t) {