From 985c2eace4f74336e51bc1a3e08c606d49af4c83 Mon Sep 17 00:00:00 2001 From: Francesco Mangiacrapa Date: Thu, 16 Mar 2017 10:59:48 +0000 Subject: [PATCH] commented scope provider reset git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace-tree-widget@144980 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../user/workspace/server/GWTWorkspaceServiceImpl.java | 2 +- .../workspace/server/reader/ApplicationProfileReader.java | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceServiceImpl.java b/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceServiceImpl.java index b1e1697..76141fd 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceServiceImpl.java +++ b/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceServiceImpl.java @@ -3924,7 +3924,7 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT workspaceLogger.error("Error in server FormattedGcubeItemProperties: ", e); throw new Exception(e.getMessage()); } catch (Exception e) { - workspaceLogger.error("Error in server FormattedGcubeItemProperties: ", e); + workspaceLogger.error("Error in server markFolderAsPublicForFolderItemId: ", e); String error = ConstantsExplorer.SERVER_ERROR +" reading Folder Link for id: "+itemId; throw new Exception(error); } diff --git a/src/main/java/org/gcube/portlets/user/workspace/server/reader/ApplicationProfileReader.java b/src/main/java/org/gcube/portlets/user/workspace/server/reader/ApplicationProfileReader.java index 6daab09..9de00f9 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/server/reader/ApplicationProfileReader.java +++ b/src/main/java/org/gcube/portlets/user/workspace/server/reader/ApplicationProfileReader.java @@ -79,7 +79,6 @@ public class ApplicationProfileReader { ApplicationProfile appProf = new ApplicationProfile(); String queryString = getGcubeGenericQueryString(secondaryType, appID); - String originalScope = null; try { @@ -138,10 +137,11 @@ public class ApplicationProfileReader { logger.info("Scope "+ scope.toString() + " is not a VRE"); List listSessionScope = helper.evaluate("/Resource/Profile/Body/EndPoint[Scope='"+scope.toString()+"']/Sessionscope/text()"); //get session scope of i+1-mo scope + logger.debug("ListSessionScope is: "+ listSessionScope.toString()); if(listSessionScope!=null && listSessionScope.size()>0){ //If sessions scope exists - logger.trace("setting session scope "+ listSessionScope.get(0)); + logger.debug("setting session scope "+ listSessionScope.get(0)); appProf.setScope(listSessionScope.get(0)); } else{ @@ -171,6 +171,7 @@ public class ApplicationProfileReader { } else throw new ApplicationProfileNotFoundException("Your applicationProfile with scope "+scope.toString()+" was not found in the profile, consider adding element in "); + logger.debug("returning: "+appProf); return appProf; } @@ -178,13 +179,14 @@ public class ApplicationProfileReader { logger.error("Error while trying to fetch applicationProfile profile from the infrastructure", e); return null; }finally{ + /* if(originalScope!=null && !originalScope.isEmpty()){ ScopeProvider.instance.set(originalScope); logger.info("scope provider setted to orginal scope: "+originalScope); }else{ ScopeProvider.instance.reset(); logger.info("scope provider reset"); - } + }*/ } }