From 5dc85cb43b2e4e527a16ae1b25ca763e631c99c5 Mon Sep 17 00:00:00 2001 From: Francesco Mangiacrapa Date: Tue, 24 Apr 2018 08:58:24 +0000 Subject: [PATCH] fixed ckan exception git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/data-transfer/uri-resolver@167182 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../resolver/catalogue/CatalogueResolver.java | 2 +- .../resource/CkanCatalogueConfigurationsReader.java | 13 +++++++++---- 2 files changed, 10 insertions(+), 5 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 36ac781..fa9ecbb 100644 --- a/src/main/java/org/gcube/datatransfer/resolver/catalogue/CatalogueResolver.java +++ b/src/main/java/org/gcube/datatransfer/resolver/catalogue/CatalogueResolver.java @@ -217,7 +217,7 @@ public class CatalogueResolver extends HttpServlet{ logger.info("The dataset "+datasetName+" is a public item using public access to CKAN portlet: "+ckanPorltetUrl); } }catch(Exception e){ - logger.warn("Error on checking if dataset: "+datasetName+" is private or not"); + logger.warn("Error on checking if dataset: "+datasetName+" is private or not", e); ckanPorltetUrl = ckanCatalogueReference.getPublicPortletURL(); } } diff --git a/src/main/java/org/gcube/datatransfer/resolver/catalogue/resource/CkanCatalogueConfigurationsReader.java b/src/main/java/org/gcube/datatransfer/resolver/catalogue/resource/CkanCatalogueConfigurationsReader.java index a75168d..b9f4fd5 100644 --- a/src/main/java/org/gcube/datatransfer/resolver/catalogue/resource/CkanCatalogueConfigurationsReader.java +++ b/src/main/java/org/gcube/datatransfer/resolver/catalogue/resource/CkanCatalogueConfigurationsReader.java @@ -31,6 +31,7 @@ import org.w3c.dom.Node; import org.xml.sax.InputSource; import eu.trentorise.opendata.jackan.CkanClient; +import eu.trentorise.opendata.jackan.exceptions.CkanException; import eu.trentorise.opendata.jackan.model.CkanDataset; @@ -91,14 +92,18 @@ public class CkanCatalogueConfigurationsReader { * @throws Exception */ public static CkanDataset getDataset(String datasetIdorName, String catalogueURL) throws Exception{ - logger.info("Request ckan dataset with id " + datasetIdorName); + logger.info("Request GET CKAN dataset with id: " + datasetIdorName); // checks checkNotNull(datasetIdorName); checkArgument(!datasetIdorName.isEmpty()); - - CkanClient client = new CkanClient(catalogueURL); - return client.getDataset(datasetIdorName); + try{ + CkanClient client = new CkanClient(catalogueURL); + return client.getDataset(datasetIdorName); + }catch(CkanException e){ + logger.info("CkanException thrown, returning null"); + return null; + } }