LMS-2596 fixed

SVN: 23340

datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/AbstractDssServiceRpc.java

@@ -33,6 +33,7 @@ import ch.systemsx.cisd.openbis.dss.generic.shared.IEncapsulatedOpenBISService;
 import ch.systemsx.cisd.openbis.dss.generic.shared.IHierarchicalContentProvider;
 import ch.systemsx.cisd.openbis.dss.generic.shared.IShareIdManager;
 import ch.systemsx.cisd.openbis.dss.generic.shared.ServiceProvider;
+import ch.systemsx.cisd.openbis.dss.generic.shared.api.v1.DataStoreApiUrlUtilities;
 import ch.systemsx.cisd.openbis.dss.generic.shared.utils.DatasetLocationUtil;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DatabaseInstance;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ExternalData;
@@ -66,7 +67,7 @@ public abstract class AbstractDssServiceRpc<T> extends AbstractServiceWithLogger
 
     public final void setDownloadUrl(String downloadUrl)
     {
-        this.downloadUrl = downloadUrl;
+        this.downloadUrl = DataStoreApiUrlUtilities.getDataStoreUrlFromDownloadUrl(downloadUrl);
     }
 
     /**

datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DataStoreServer.java

@@ -354,7 +354,7 @@ public class DataStoreServer
     
     private static void registerStreamHandlingServlet(ServletContextHandler context)
     {
-        context.addServlet(IdentifiedStreamHandlingServlet.class, "/"
+        context.addServlet(IdentifiedStreamHandlingServlet.class, "/" + DATA_STORE_SERVER_WEB_APPLICATION_NAME + "/"
                 + IdentifiedStreamHandlingServlet.SERVLET_NAME + "/*");
     }