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
This commit is contained in:
parent
f39e3634d2
commit
985c2eace4
|
@ -3924,7 +3924,7 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
|
||||||
workspaceLogger.error("Error in server FormattedGcubeItemProperties: ", e);
|
workspaceLogger.error("Error in server FormattedGcubeItemProperties: ", e);
|
||||||
throw new Exception(e.getMessage());
|
throw new Exception(e.getMessage());
|
||||||
} catch (Exception e) {
|
} 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;
|
String error = ConstantsExplorer.SERVER_ERROR +" reading Folder Link for id: "+itemId;
|
||||||
throw new Exception(error);
|
throw new Exception(error);
|
||||||
}
|
}
|
||||||
|
|
|
@ -79,7 +79,6 @@ public class ApplicationProfileReader {
|
||||||
|
|
||||||
ApplicationProfile appProf = new ApplicationProfile();
|
ApplicationProfile appProf = new ApplicationProfile();
|
||||||
String queryString = getGcubeGenericQueryString(secondaryType, appID);
|
String queryString = getGcubeGenericQueryString(secondaryType, appID);
|
||||||
String originalScope = null;
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
|
|
||||||
|
@ -138,10 +137,11 @@ public class ApplicationProfileReader {
|
||||||
logger.info("Scope "+ scope.toString() + " is not a VRE");
|
logger.info("Scope "+ scope.toString() + " is not a VRE");
|
||||||
|
|
||||||
List<String> listSessionScope = helper.evaluate("/Resource/Profile/Body/EndPoint[Scope='"+scope.toString()+"']/Sessionscope/text()"); //get session scope of i+1-mo scope
|
List<String> 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
|
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));
|
appProf.setScope(listSessionScope.get(0));
|
||||||
}
|
}
|
||||||
else{
|
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 <EndPoint><Scope> element in <Body>");
|
else throw new ApplicationProfileNotFoundException("Your applicationProfile with scope "+scope.toString()+" was not found in the profile, consider adding <EndPoint><Scope> element in <Body>");
|
||||||
|
|
||||||
|
logger.debug("returning: "+appProf);
|
||||||
return appProf;
|
return appProf;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -178,13 +179,14 @@ public class ApplicationProfileReader {
|
||||||
logger.error("Error while trying to fetch applicationProfile profile from the infrastructure", e);
|
logger.error("Error while trying to fetch applicationProfile profile from the infrastructure", e);
|
||||||
return null;
|
return null;
|
||||||
}finally{
|
}finally{
|
||||||
|
/*
|
||||||
if(originalScope!=null && !originalScope.isEmpty()){
|
if(originalScope!=null && !originalScope.isEmpty()){
|
||||||
ScopeProvider.instance.set(originalScope);
|
ScopeProvider.instance.set(originalScope);
|
||||||
logger.info("scope provider setted to orginal scope: "+originalScope);
|
logger.info("scope provider setted to orginal scope: "+originalScope);
|
||||||
}else{
|
}else{
|
||||||
ScopeProvider.instance.reset();
|
ScopeProvider.instance.reset();
|
||||||
logger.info("scope provider reset");
|
logger.info("scope provider reset");
|
||||||
}
|
}*/
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue