From bdd9d424175aeb18037697fe334eba90bf793afb Mon Sep 17 00:00:00 2001
From: anttil <anttil>
Date: Tue, 19 Mar 2013 08:22:09 +0000
Subject: [PATCH] BIS-350 / SP-561: Expired download session message is handled
as a real file
SVN: 28639
---
.../dss/generic/server/AbstractDatasetDownloadServlet.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/AbstractDatasetDownloadServlet.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/AbstractDatasetDownloadServlet.java
index c27c5e289d4..99db2b39e0c 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/AbstractDatasetDownloadServlet.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/AbstractDatasetDownloadServlet.java
@@ -45,8 +45,8 @@ import ch.systemsx.cisd.openbis.common.io.hierarchical_content.api.IHierarchical
import ch.systemsx.cisd.openbis.dss.generic.shared.IEncapsulatedOpenBISService;
import ch.systemsx.cisd.openbis.dss.generic.shared.dto.Size;
import ch.systemsx.cisd.openbis.dss.generic.shared.utils.ImageUtil;
-import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DatabaseInstance;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.AbstractExternalData;
+import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DatabaseInstance;
/**
* Superclass for dataset download servlets. Provides functionality to deliver content of files and
@@ -210,6 +210,7 @@ abstract public class AbstractDatasetDownloadServlet extends HttpServlet
protected final static void printErrorResponse(final HttpServletResponse response,
String errorMessage) throws IOException
{
+ response.setContentType("text/html");
PrintWriter writer = response.getWriter();
writer.write("<html><body>" + errorMessage + "</body></html>");
writer.flush();
@@ -371,7 +372,8 @@ abstract public class AbstractDatasetDownloadServlet extends HttpServlet
return map;
}
- protected final AbstractExternalData tryToGetCachedDataSet(HttpSession session, String dataSetCode)
+ protected final AbstractExternalData tryToGetCachedDataSet(HttpSession session,
+ String dataSetCode)
{
return getDataSets(session).get(dataSetCode);
}
--
GitLab