From 569838c6eb5fee77261fa3717cbd75302ce5c167 Mon Sep 17 00:00:00 2001
From: Costantino Perciante <costantino.perciante@isti.cnr.it>
Date: Fri, 25 Nov 2016 15:49:18 +0000
Subject: [PATCH] getCurrentUserToken fixed: it always returned null

git-svn-id: https://svn.research-infrastructures.eu/d4science/gcube/trunk/portal/portal-manager@134840 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 src/main/java/org/gcube/common/portal/PortalContext.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/gcube/common/portal/PortalContext.java b/src/main/java/org/gcube/common/portal/PortalContext.java
index da6a4ba..5106499 100644
--- a/src/main/java/org/gcube/common/portal/PortalContext.java
+++ b/src/main/java/org/gcube/common/portal/PortalContext.java
@@ -258,10 +258,10 @@ public class PortalContext {
 	 */
 	public String getCurrentUserToken(HttpServletRequest httpServletRequest) {
 		String groupIdNo = httpServletRequest.getHeader(VRE_ID_ATTR_NAME);
+		String userToken = null;
 		if (groupIdNo != null) {
 			String scope = getCurrentScope(httpServletRequest);
 			String username = getCurrentUser(httpServletRequest).getUsername();
-			String userToken = null;
 			try {
 				ScopeProvider.instance.set(scope);
 				userToken = authorizationService().resolveTokenByUserAndContext(username, scope);
@@ -287,7 +287,7 @@ public class PortalContext {
 				return toReturn;
 			}
 		}
-		return null;
+		return userToken;
 	}
 
 	/**