From 52c446292023643d6c0e89d10881e51c0b9a5074 Mon Sep 17 00:00:00 2001 From: Francesco Mangiacrapa Date: Wed, 29 Oct 2014 15:19:41 +0000 Subject: [PATCH] changed generic resource reader git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/uri-resolver-manager@101166 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../readers/UriResolverMapReader.java | 10 +++++++--- src/test/java/UriResolverTest.java | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/gcube/portlets/user/uriresolvermanager/readers/UriResolverMapReader.java b/src/main/java/org/gcube/portlets/user/uriresolvermanager/readers/UriResolverMapReader.java index b2b2472..9ed3e19 100644 --- a/src/main/java/org/gcube/portlets/user/uriresolvermanager/readers/UriResolverMapReader.java +++ b/src/main/java/org/gcube/portlets/user/uriresolvermanager/readers/UriResolverMapReader.java @@ -103,9 +103,13 @@ public class UriResolverMapReader { for (String at : appTypes) { logger.info("Application Type "+at); // currValue = helper.evaluate("/Resource/Profile/Body/EndPoint[Scope='"+scope.toString()+"']/Scope/text()"); - currValue = helper.evaluate("/Resource/Profile/Body/access_point[application_type='"+at+"']/resource/text()"); - applicationTypes.put(at, currValue.get(0)); - logger.info("Stored: "+at +" -> Resource: "+ currValue.get(0)); + List resources = helper.evaluate("/Resource/Profile/Body/access_point[application_type='"+at+"']/resource/text()"); + + if(resources!=null && resources.size()>0){ + applicationTypes.put(at, resources.get(0)); + logger.info("Stored: "+at +" -> Resource: "+ currValue.get(0)); + }else + logger.warn("Skipping Type "+at+" generic resource not found!"); } } } diff --git a/src/test/java/UriResolverTest.java b/src/test/java/UriResolverTest.java index df12b9a..c5ae0e1 100644 --- a/src/test/java/UriResolverTest.java +++ b/src/test/java/UriResolverTest.java @@ -38,7 +38,7 @@ public class UriResolverTest { } } -// @Test + @Test public void testSMP() { try {