1 files changed, 11 insertions, 15 deletions
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/CertStoreConfigurationImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/CertStoreConfigurationImpl.java
index c9be3fc2b..e6e084e11 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/CertStoreConfigurationImpl.java
+++ b/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/CertStoreConfigurationImpl.java
@@ -27,21 +27,17 @@ public class CertStoreConfigurationImpl
    * @param config The MOA configuration from which the configuration data is
    * being read.
    */
-  public CertStoreConfigurationImpl(ConfigurationProvider config) {
-    String certStoreRoot =
-      config.getGenericConfiguration(
-        ConfigurationProvider.DIRECTORY_CERTSTORE_PARAMETER_PROPERTY,
-        "certstore");
-
-    if (certStoreRoot != null) {
-      DirectoryCertStoreParameters dirParameters =
-        new DirectoryCertStoreParametersImpl(
-          "MOA Directory CertStore",
-          certStoreRoot,
-          true,
-          false);
-      parameters = new CertStoreParameters[] { dirParameters };
-    }
+  public CertStoreConfigurationImpl(ConfigurationProvider config) 
+  {
+    String certStoreRoot = config.getCertStoreLocation();
+
+    DirectoryCertStoreParameters dirParameters = new DirectoryCertStoreParametersImpl(
+      "MOA Directory CertStore",
+      certStoreRoot,
+      true,
+      false);
+
+    parameters = new CertStoreParameters[] { dirParameters };
   }
 
   /**