From 0ece4c7a9fd092e7c73d94a5ccd0c402a628c2fa Mon Sep 17 00:00:00 2001
From: "giancarlo.panichi" <giancarlo.panichi@isti.cnr.it>
Date: Thu, 22 Dec 2016 13:45:36 +0000
Subject: [PATCH] Fixed Token null on reload session problem

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/admin/accounting-manager@141367 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .../accountingmanager/server/SessionUtil.java | 20 +++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/SessionUtil.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/SessionUtil.java
index 37d650b..eaad635 100644
--- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/SessionUtil.java
+++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/SessionUtil.java
@@ -86,6 +86,7 @@ public class SessionUtil {
 
 			}
 
+			logger.debug("Scope: " + scope);
 			if (scope == null || scope.isEmpty()) {
 				String error = "Error retrieving scope: " + scope;
 				logger.error(error);
@@ -107,7 +108,7 @@ public class SessionUtil {
 			} else {
 				gCubeUser = pContext.getCurrentUser(httpServletRequest);
 			}
-			
+
 			if (gCubeUser == null) {
 				String error = "Error retrieving gCubeUser in scope " + scope
 						+ ": " + gCubeUser;
@@ -116,6 +117,7 @@ public class SessionUtil {
 			}
 
 			userName = gCubeUser.getUsername();
+			logger.debug("UserName: " + userName);
 
 			if (userName == null || userName.isEmpty()) {
 				String error = "Error retrieving username in scope " + scope
@@ -124,8 +126,22 @@ public class SessionUtil {
 				throw new ServiceException(error);
 			}
 
-			token = pContext.getCurrentUserToken(scope, httpServletRequest);
+			if (hasCurrUserId) {
+				try {
+					token = pContext.getCurrentUserToken(scope,
+							Long.valueOf(currUserId));
+				} catch (Exception e) {
+					String error = "Error retrieving token for: [userId= "
+							+ currUserId + ", scope: " + scope + "]";
+					logger.error(error, e);
+					throw new ServiceException(error);
+				}
 
+			} else {
+				token = pContext.getCurrentUserToken(scope, httpServletRequest);
+			}
+
+			logger.debug("Token: " + token);
 			if (token == null || token.isEmpty()) {
 				String error = "Error retrieving token for " + userName
 						+ " in " + scope + ": " + token;