From d9c3c710f2b567cb30df02cdcaddf38a5e4ca55c Mon Sep 17 00:00:00 2001
From: "francesco.mangiacrapa" <francesco.mangiacrapa@isti.cnr.it>
Date: Fri, 15 May 2020 14:37:35 +0200
Subject: [PATCH] bug fixing #19232

---
 changelog.md                                  |  2 ++
 changelog.xml                                 |  5 ++++-
 .../server/WorkspaceUploadServletStream.java  | 21 ++++++++++---------
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/changelog.md b/changelog.md
index 7d0dd09..6f18dd7 100644
--- a/changelog.md
+++ b/changelog.md
@@ -11,6 +11,8 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
 [#19243] upload archive facility does not work properly with Windows OS
 
+[#19232] manage file names that use special characters
+
 ## [2.0.4] - 2019-12-19
 
 **Notes**
diff --git a/changelog.xml b/changelog.xml
index 79fa6ba..d435f93 100644
--- a/changelog.xml
+++ b/changelog.xml
@@ -3,7 +3,10 @@
 		component="org.gcube.portlets-widgets.workspace-uploader.2-0-5"
 		date="2020-05-14">
 		<Change>[Bug #19243] upload archive facility does not work properly
-			with Windows OS</Change>
+			with Windows OS
+		</Change>
+		<Change>[Task #19232] manage file names that use special characters
+		</Change>
 	</Changeset>
 	<Changeset
 		component="org.gcube.portlets-widgets.workspace-uploader.2-0-4"
diff --git a/src/main/java/org/gcube/portlets/widgets/workspaceuploader/server/WorkspaceUploadServletStream.java b/src/main/java/org/gcube/portlets/widgets/workspaceuploader/server/WorkspaceUploadServletStream.java
index f581790..dd382e5 100644
--- a/src/main/java/org/gcube/portlets/widgets/workspaceuploader/server/WorkspaceUploadServletStream.java
+++ b/src/main/java/org/gcube/portlets/widgets/workspaceuploader/server/WorkspaceUploadServletStream.java
@@ -45,7 +45,6 @@ import org.gcube.common.storagehubwrapper.shared.tohl.exceptions.InsufficientPri
 import org.gcube.common.storagehubwrapper.shared.tohl.exceptions.InternalErrorException;
 import org.gcube.common.storagehubwrapper.shared.tohl.exceptions.ItemAlreadyExistException;
 import org.gcube.common.storagehubwrapper.shared.tohl.exceptions.ItemNotFoundException;
-import org.gcube.common.storagehubwrapper.shared.tohl.exceptions.WrongItemTypeException;
 import org.gcube.portlets.widgets.workspaceuploader.client.ConstantsWorkspaceUploader;
 import org.gcube.portlets.widgets.workspaceuploader.server.notification.NotificationsWorkspaceUploader;
 import org.gcube.portlets.widgets.workspaceuploader.server.notification.NotificationsWorkspaceUploaderProducer;
@@ -526,15 +525,17 @@ public class WorkspaceUploadServletStream extends HttpServlet implements Servlet
 			inputStream.addListener(uploadProgressListener);
 			workspaceUploader.setUploadProgress(uploadProgressListener.getUploadProgress());
 
-			//USING isOverwrite to check if the file already exists
-			try {
-				isOverwrite = storageHubWrapper.getWorkspace().exists(itemName, destinationFolder.getId());
-				workspaceUploader.setIsOverwrite(isOverwrite);
-				logger.info("The file: "+itemName+ " exists in the folder? "+isOverwrite);
-				saveWorkspaceUploaderInSession(workspaceUploader, request.getSession());
-			}catch (ItemNotFoundException | WrongItemTypeException e) {
-				logger.warn("Error on checking if the file: "+itemName+" exists in the folder id: "+ destinationFolder.getId());
-			}
+
+			//Commented this. FIXING ISSUE #19232
+//			try {
+//				//USING isOverwrite to check if the file already exists
+//				isOverwrite = storageHubWrapper.getWorkspace().exists(itemName, destinationFolder.getId());
+//				workspaceUploader.setIsOverwrite(isOverwrite);
+//				logger.info("The file: "+itemName+ " exists in the folder? "+isOverwrite);
+//				saveWorkspaceUploaderInSession(workspaceUploader, request.getSession());
+//			}catch (ItemNotFoundException | WrongItemTypeException e) {
+//				logger.warn("Error on checking if the file: "+itemName+" exists in the folder id: "+ destinationFolder.getId());
+//			}
 
 			saveWorkspaceUploaderInSession(workspaceUploader, request.getSession());