From 97c40f921606216f13479cc8a2e6e2f3646713ab Mon Sep 17 00:00:00 2001 From: Francesco Mangiacrapa Date: Wed, 22 Feb 2017 13:19:04 +0000 Subject: [PATCH] Added a patch in oder to avoid full scope null read from hash vrename-fullscope loaded at init time from Application Profile ResourceCatalogue git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/data-transfer/uri-resolver@144111 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../resolver/catalogue/CatalogueResolver.java | 22 +++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/gcube/datatransfer/resolver/catalogue/CatalogueResolver.java b/src/main/java/org/gcube/datatransfer/resolver/catalogue/CatalogueResolver.java index 37fa5d3..2c39b44 100644 --- a/src/main/java/org/gcube/datatransfer/resolver/catalogue/CatalogueResolver.java +++ b/src/main/java/org/gcube/datatransfer/resolver/catalogue/CatalogueResolver.java @@ -85,7 +85,7 @@ public class CatalogueResolver extends HttpServlet{ throw new ServletException(CatalogueResolver.class.getName() +" cannot work without set the Environment Variable: "+ENV_SCOPE); appPrCatResolver = new ApplicationProfileReaderForCatalogueResolver(scopeToEncDecr, true); - logger.info("Reosurce for Catalogue Resolver: "+appPrCatResolver); + logger.info("Resource read for CatalogueResolver: "+appPrCatResolver); return scopeToEncDecr; } @@ -166,7 +166,14 @@ public class CatalogueResolver extends HttpServlet{ appPrCatResolver = new ApplicationProfileReaderForCatalogueResolver(scopeToEncDecr, true); String fullScope = appPrCatResolver.getHashVreNameScope().get(scope); - logger.debug("Read fullScope: "+fullScope + " for VRE_NAME: "+scope +" from Map and overring it"); + + if(fullScope==null){ + logger.debug("FullScope is null for VRE_NAME: "+scope+" into Application Profile: "+ApplicationProfileReaderForCatalogueResolver.RESOURCE_NAME+", reading profile again"); + appPrCatResolver = new ApplicationProfileReaderForCatalogueResolver(scopeToEncDecr, true); + fullScope = appPrCatResolver.getHashVreNameScope().get(scope); + } + + logger.debug("Read fullScope: "+fullScope + " for VRE_NAME: "+scope +" into Application Profile "+ApplicationProfileReaderForCatalogueResolver.RESOURCE_NAME); cer.addParameterToRequest(CatalogueRequestParameter.GCUBE_SCOPE.getKey(), fullScope); scope = fullScope; } @@ -453,4 +460,15 @@ public class CatalogueResolver extends HttpServlet{ return s; } } + + public static void main(String[] args) { + + try{ + String scope = "d4science.research"; + ApplicationProfileReaderForCatalogueResolver appPrCatResolver = new ApplicationProfileReaderForCatalogueResolver(scope, true); + logger.info("Reosurce for Catalogue Resolver: "+appPrCatResolver); + }catch(Exception e){ + e.printStackTrace(); + } + } }