From 97a900a6fe1ad621f0fc5b7121ad5e4b632dd070 Mon Sep 17 00:00:00 2001
From: brinn <brinn>
Date: Tue, 6 Jul 2010 14:49:18 +0000
Subject: [PATCH] change: adapt to changed interface of SslCertificateHelper
SVN: 16891
---
.../dss/client/api/v1/impl/DssServiceRpcFactory.java | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/impl/DssServiceRpcFactory.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/impl/DssServiceRpcFactory.java
index 9c6f27412b8..9cc9d6b2392 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/impl/DssServiceRpcFactory.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/impl/DssServiceRpcFactory.java
@@ -55,7 +55,7 @@ public class DssServiceRpcFactory implements IRpcServiceFactory
Class<IRpcServiceNameServer> clazz = IRpcServiceNameServer.class;
if (getServerCertificateFromServer)
{
- new SslCertificateHelper(nameServerURL, getConfigDirectory(), "dss").setUpKeyStore();
+ new SslCertificateHelper(nameServerURL, getKeystoreFile(), "dss").setUpKeyStore();
}
IRpcServiceNameServer nameServer =
@@ -71,13 +71,18 @@ public class DssServiceRpcFactory implements IRpcServiceFactory
String serviceURL = serverURL + ifaceVersion.getUrlSuffix();
if (getServerCertificateFromServer)
{
- new SslCertificateHelper(serviceURL, getConfigDirectory(), "dss").setUpKeyStore();
+ new SslCertificateHelper(serviceURL, getKeystoreFile(), "dss").setUpKeyStore();
}
return new ServiceProxyBuilder<T>(serviceURL, ifaceClazz, SERVER_TIMEOUT_MIN, 1)
.getServiceInterface();
}
+ private File getKeystoreFile()
+ {
+ return new File(getConfigDirectory(), "keystore");
+ }
+
private File getConfigDirectory()
{
String homeDir = System.getProperty("dss.root");
--
GitLab