From 32925c79549485f4be6b7d2dac52fa0b8e7bbf6d Mon Sep 17 00:00:00 2001
From: "francesco.mangiacrapa" <francesco.mangiacrapa@isti.cnr.it>
Date: Mon, 18 Jan 2021 12:57:44 +0100
Subject: [PATCH] Bug Fixing #20457. Moved to 1.0.0-SNAPSHOT

---
 CHANGELOG.md                                       |  7 +++++++
 pom.xml                                            |  2 +-
 .../common/workspacetaskexecutor/util/WsUtil.java  | 14 ++++++++------
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 428998c..77c461f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,13 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [v1.0.0-SNAPSHOT] - 2021-01-18
+
+#### Bug Fixes
+
+[#20457] Fixed incident
+
+
 ## [v0.3.0] - 2020-07-27
 
 [#19677] Migrated to git/jenkins
diff --git a/pom.xml b/pom.xml
index 85eed50..c0e3335 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 
 	<groupId>org.gcube.common</groupId>
 	<artifactId>workspace-task-executor-library</artifactId>
-	<version>0.3.0</version>
+	<version>1.0.0-SNAPSHOT</version>
 	<name>workspace-task-executor-library</name>
 	<description>The workspace-task-executor-library is a library to execute data miner's algorithms from workspace</description>
 
diff --git a/src/main/java/org/gcube/common/workspacetaskexecutor/util/WsUtil.java b/src/main/java/org/gcube/common/workspacetaskexecutor/util/WsUtil.java
index 59a2169..9b06434 100644
--- a/src/main/java/org/gcube/common/workspacetaskexecutor/util/WsUtil.java
+++ b/src/main/java/org/gcube/common/workspacetaskexecutor/util/WsUtil.java
@@ -16,19 +16,16 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 
-
 /**
  * The Class WsUtil.
  *
  * @author Francesco Mangiacrapa at ISTI-CNR (francesco.mangiacrapa@isti.cnr.it)
  * 
- * Sep 6, 2019
+ * Jan 18, 2021
  */
 public class WsUtil {
 
 	private static Logger logger = LoggerFactory.getLogger(WsUtil.class);
-	
-	private Workspace theWorkspace;
 
 	/**
 	 * Gets the workspace from storage hub.
@@ -65,13 +62,18 @@ public class WsUtil {
 	 */
 	public Workspace getWorkspace() throws Exception{
 		
-		if(theWorkspace==null) {
+		/*if(theWorkspace==null) {
 			checkInitParameters();
 			String scope = ScopeProvider.instance.get();
 			String token = SecurityTokenProvider.instance.get();
 			theWorkspace = getWorkspaceFromStorageHub(scope, token);
 		}
-		return theWorkspace;
+		return theWorkspace;*/
+		String scope = ScopeProvider.instance.get();
+		String token = SecurityTokenProvider.instance.get();
+		if(token!=null)
+			logger.debug("Instancing "+StorageHubWrapper.class.getSimpleName()+" with token: "+token.substring(0,token.length()-10)+"[MASKED-TOKEN]");
+		return  getWorkspaceFromStorageHub(scope, token);
 			
 	}