aboutsummaryrefslogtreecommitdiff
path: root/spss.server
diff options
context:
space:
mode:
authorharald.bratko <harald.bratko@d688527b-c9ab-4aba-bd8d-4036d912da1d>2005-08-19 07:53:12 +0000
committerharald.bratko <harald.bratko@d688527b-c9ab-4aba-bd8d-4036d912da1d>2005-08-19 07:53:12 +0000
commit21efdc48ab233961ff96d1181d018a61a380d906 (patch)
tree103f1fe671d85bdbd070fb4c0c40dde261433b4a /spss.server
parent9b543bbd3edf7c201e5c5e026a02d80957e485a0 (diff)
downloadmoa-id-spss-21efdc48ab233961ff96d1181d018a61a380d906.tar.gz
moa-id-spss-21efdc48ab233961ff96d1181d018a61a380d906.tar.bz2
moa-id-spss-21efdc48ab233961ff96d1181d018a61a380d906.zip
dumpKeyEntry only called, if key modules configured;
modified reset for TrustStoreFactory git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@447 d688527b-c9ab-4aba-bd8d-4036d912da1d
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) {