[LMS-1924] reverted changes that broken DSS url createion logic

SVN: 19054

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;
     }
+
 }

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());
     }
 
     /**