From 9d7777978cc4c87acf85dd542e5e49c69ab01189 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Mon, 29 Oct 2018 16:53:00 +0000 Subject: [PATCH] ref 11724: SAI - Update to StorageHUB https://support.d4science.org/issues/11724 Updated to StorageHub git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/statistical-algorithms-importer@173867 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../server/DownloadServlet.java | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/server/DownloadServlet.java b/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/server/DownloadServlet.java index 2a1705e..9b88fca 100644 --- a/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/server/DownloadServlet.java +++ b/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/server/DownloadServlet.java @@ -101,36 +101,39 @@ public class DownloadServlet extends HttpServlet { String fileName; if (itemDownload.getItemDescription() == null) { fileName = "filename"; - resp.setHeader("Content-Disposition:", "attachment;filename=\"" + fileName + "\""); + resp.setHeader("Content-Disposition", "attachment;filename=\"" + fileName + "\""); resp.setHeader("Content-Type", "application/force-download"); - } else { + } else { if (itemDownload.getItemDescription().getName() == null || itemDownload.getItemDescription().getName().isEmpty()) { if (itemDownload.getItemDescription().getType() != null && itemDownload.getItemDescription() .getType().compareTo(FolderItem.class.getSimpleName()) == 0) { fileName = "folder.zip"; - resp.setHeader("Content-Disposition:", "attachment;filename=\"" + fileName + "\""); + resp.setHeader("Content-Disposition", "attachment;filename=\"" + fileName + "\""); resp.setHeader("Content-Type", "application/zip"); } else { fileName = "filename"; - resp.setHeader("Content-Disposition:", "attachment;filename=\"" + fileName + "\""); + resp.setHeader("Content-Disposition", "attachment;filename=\"" + fileName + "\""); resp.setHeader("Content-Type", "application/force-download"); } } else { if (itemDownload.getItemDescription().getType() != null && itemDownload.getItemDescription() .getType().compareTo(FolderItem.class.getSimpleName()) == 0) { fileName = itemDownload.getItemDescription().getName() + ".zip"; - resp.setHeader("Content-Disposition:", "attachment;filename=\"" + fileName + "\""); + resp.setHeader("Content-Disposition", "attachment;filename=\"" + fileName + "\""); resp.setHeader("Content-Type", "application/zip"); } else { fileName = itemDownload.getItemDescription().getName(); - resp.setHeader("Content-Disposition:", "attachment;filename=\"" + fileName + "\""); + resp.setHeader("Content-Disposition", "attachment;filename=\"" + fileName + "\""); resp.setHeader("Content-Type", "application/force-download"); } } } - logger.debug("DownloadServlet filename: " + fileName); + + logger.debug("Content-Disposition: "+resp.getHeader("Content-Disposition")); + logger.debug("Content-Type: "+resp.getHeader("Content-Type")); + logger.debug("DownloadServlet() filename: " + fileName); stream(itemDownload.getInputStream(), resp.getOutputStream()); } }