From 7b4e8d6aca42ccc0ccf638df2fd3163090a0da24 Mon Sep 17 00:00:00 2001
From: Giancarlo Panichi <giancarlo.panichi@isti.cnr.it>
Date: Wed, 4 Jun 2014 17:35:54 +0000
Subject: [PATCH] Minor Update

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-gwt-service@96702 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .../td/gwtservice/server/SessionUtil.java     |  4 ++--
 .../gwtservice/server/TDGWTServiceImpl.java   | 19 +++++++++----------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/SessionUtil.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/SessionUtil.java
index 1f3fe6b..b22c0ce 100644
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/SessionUtil.java
+++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/SessionUtil.java
@@ -94,8 +94,8 @@ public class SessionUtil {
 			httpSession.setAttribute(ScopeHelper.USERNAME_ATTRIBUTE, username);
 			session = SessionManager.getInstance().getASLSession(
 					httpSession.getId(), username);
-			session.setScope(scope);
-			*/
+			session.setScope(scope);*/
+			
 		} else {
 			session = SessionManager.getInstance().getASLSession(
 					httpSession.getId(), username);
diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/TDGWTServiceImpl.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/TDGWTServiceImpl.java
index 4b0df84..359d80e 100644
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/TDGWTServiceImpl.java
+++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/TDGWTServiceImpl.java
@@ -8100,15 +8100,9 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
 			logger.debug("StartCodelistMappingImport: "
 					+ codelistMappingSession.toString());
 
-			CodelistMappingFileUploadSession codelistMappingFileUploadSession = SessionUtil
-					.getCodelistMappingFileUploadSession(session);
-			if (codelistMappingFileUploadSession == null) {
-				throw new TDGWTServiceException(
-						"Error retrieving the codelistMappingFileUploadSession: null");
-			}
+			
 
-			importCodelistMappingFileOnService(session, aslSession, user,
-					codelistMappingFileUploadSession, codelistMappingSession);
+			importCodelistMappingFileOnService(session, aslSession, user, codelistMappingSession);
 		} catch (TDGWTSessionExpiredException e) {
 			throw e;
 		} catch (Throwable e) {
@@ -8227,7 +8221,6 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
 	 */
 	protected void importCodelistMappingFileOnService(HttpSession session,
 			ASLSession aslSession, String user,
-			CodelistMappingFileUploadSession codelistMappingFileUploadSession,
 			CodelistMappingSession codelistMappingSession) throws Throwable {
 
 		String importUrl = null;
@@ -8236,6 +8229,12 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
 				.compareTo(SourceType.URL.toString()) == 0) {
 			importUrl = codelistMappingSession.getUrl();
 		} else {
+			CodelistMappingFileUploadSession codelistMappingFileUploadSession = SessionUtil
+					.getCodelistMappingFileUploadSession(session);
+			if (codelistMappingFileUploadSession == null) {
+				throw new TDGWTServiceException(
+						"Error retrieving the codelistMappingFileUploadSession: null");
+			}
 			logger.debug("File Storage Access");
 			FilesStorage filesStorage = new FilesStorage();
 			String fileUrlOnStorage = filesStorage
@@ -8251,7 +8250,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
 			}
 			importUrl = fileUrlOnStorage;
 		}
-
+		
 		AuthorizationProvider.instance.set(new AuthorizationToken(aslSession
 				.getUsername()));
 		TabularDataService service = TabularDataServiceFactory.getService();