From 21efdc48ab233961ff96d1181d018a61a380d906 Mon Sep 17 00:00:00 2001 From: "harald.bratko" Date: Fri, 19 Aug 2005 07:53:12 +0000 Subject: 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 --- .../egovernment/moa/spss/server/iaik/config/IaikConfigurator.java | 7 ++++--- 1 file 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) { -- cgit v1.2.3