From adfd7f4839f58339576c4b0c7e78d3a6167a531a Mon Sep 17 00:00:00 2001
From: Francesco Mangiacrapa <francesco.mangiacrapa@isti.cnr.it>
Date: Tue, 9 Jul 2019 09:06:48 +0000
Subject: [PATCH] Task #17152 Workspace uploader: avoid . (dot) char added as
 suffix when the filename does not contain an extension Updated pom version at
 2.0.3

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/widgets/workspace-uploader@181177 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 distro/changelog.xml                                       | 7 +++++++
 pom.xml                                                    | 2 +-
 .../server/WorkspaceUploadServletStream.java               | 6 +++++-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/distro/changelog.xml b/distro/changelog.xml
index 7aa9a31..3300238 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -1,4 +1,11 @@
 <ReleaseNotes>
+	<Changeset
+		component="org.gcube.portlets-widgets.workspace-uploader.2-0-3"
+		date="${buildDate}">
+		<Change>[Task #17152] Workspace uploader: avoid . (dot) char added as
+			suffix when the filename does not contain an extension
+		</Change>
+	</Changeset>
 	<Changeset
 		component="org.gcube.portlets-widgets.workspace-uploader.2-0-2"
 		date="${buildDate}">
diff --git a/pom.xml b/pom.xml
index 29c3d1f..ca5ad5e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<groupId>org.gcube.portlets.widgets</groupId>
 	<artifactId>workspace-uploader</artifactId>
 	<packaging>jar</packaging>
-	<version>2.0.2-SNAPSHOT</version>
+	<version>2.0.3-SNAPSHOT</version>
 	<name>Workspace Uploader Widget</name>
 	<description>Workspace Uploader Widget allows your application to upload file/s in the gCube Workspace</description>
 	<scm>
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 73edd5d..9a576a2 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
@@ -502,7 +502,11 @@ public class WorkspaceUploadServletStream extends HttpServlet implements Servlet
 			logger.debug("extension: "+extension);
 			//Getting base name
 			String baseName = FilenameUtils.getBaseName(itemName); //Using base name in order to avoid Task #12470
-			itemName = baseName+"."+extension;
+			
+			//Task #17152
+			extension = extension.isEmpty()?"":"."+extension;
+			
+			itemName = baseName+extension;
 			logger.debug("purged item name is: "+itemName);
 			//SIZE
 			Long size = getContentLength(request);