From 6f77db3b73c7f2463f37e8b78cebc435aa1a9aad Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Wed, 19 Oct 2011 06:42:39 +0000
Subject: [PATCH] LMS-2596 fixed
SVN: 23340
---
.../cisd/openbis/dss/generic/server/AbstractDssServiceRpc.java | 3 ++-
.../cisd/openbis/dss/generic/server/DataStoreServer.java | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/AbstractDssServiceRpc.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/AbstractDssServiceRpc.java
index aa55cd114fd..b7b4f5c6108 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/AbstractDssServiceRpc.java
+++ b/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);
}
/**
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DataStoreServer.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DataStoreServer.java
index 8f9bf04a4b3..73be81089eb 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DataStoreServer.java
+++ b/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 + "/*");
}
--
GitLab