From f59d277a5f288bb7588d178b93255e87edc253f4 Mon Sep 17 00:00:00 2001
From: buczekp <buczekp>
Date: Wed, 8 Dec 2010 13:40:14 +0000
Subject: [PATCH] [LMS-1924] reverted changes that broken DSS url createion
logic
SVN: 19054
---
.../openbis/dss/client/api/v1/impl/DssComponent.java | 11 ++++++++++-
.../shared/api/v1/DataStoreApiUrlUtilities.java | 6 ++++--
2 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/impl/DssComponent.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/impl/DssComponent.java
index 60ad6d4e2df..f82b356c303 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/impl/DssComponent.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/impl/DssComponent.java
@@ -343,7 +343,7 @@ class AuthenticatedState extends AbstractDssComponentState
}
DataStore dataStore = dataSetOpenBis.getDataStore();
- String url = dataStore.getHostUrl();
+ String url = getDataStoreUrlFromDataStore(dataStore);
IDssServiceRpcGeneric dssService = getDssServiceForUrl(url);
// Return a proxy to the data set
@@ -521,9 +521,18 @@ class AuthenticatedState extends AbstractDssComponentState
+ IDssServiceRpcGeneric.DSS_SERVICE_NAME + " interface.");
}
+ /**
+ * The data store only stores the download url, get the data store url
+ */
+ private String getDataStoreUrlFromDataStore(DataStore dataStore)
+ {
+ return DataStoreApiUrlUtilities.getDataStoreUrlFromDataStore(dataStore);
+ }
+
@Override
public String getSessionToken()
{
return sessionToken;
}
+
}
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/DataStoreApiUrlUtilities.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/DataStoreApiUrlUtilities.java
index 02bbe86cb2e..e8ec719b0fa 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/DataStoreApiUrlUtilities.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/DataStoreApiUrlUtilities.java
@@ -32,10 +32,12 @@ public class DataStoreApiUrlUtilities
}
- // kept for backward compatibility
+ /**
+ * Converts the download url to a server url.
+ */
public static String getDataStoreUrlFromDataStore(DataStore dataStore)
{
- return dataStore.getHostUrl();
+ return getDataStoreUrlFromServerUrl(dataStore.getDownloadUrl());
}
/**
--
GitLab