From 434d42a1d5eb6f755d85a9f08a4f975094c51e02 Mon Sep 17 00:00:00 2001
From: Luca Frosini <luca.frosini@isti.cnr.it>
Date: Fri, 17 Feb 2023 12:10:23 +0100
Subject: [PATCH] Improved code

---
 .../isproxies/FacetBasedISConfigurationProxy.java          | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/gcube/gcat/configuration/isproxies/FacetBasedISConfigurationProxy.java b/src/main/java/org/gcube/gcat/configuration/isproxies/FacetBasedISConfigurationProxy.java
index f5cbc1a..afef568 100644
--- a/src/main/java/org/gcube/gcat/configuration/isproxies/FacetBasedISConfigurationProxy.java
+++ b/src/main/java/org/gcube/gcat/configuration/isproxies/FacetBasedISConfigurationProxy.java
@@ -77,11 +77,11 @@ public class FacetBasedISConfigurationProxy extends ISConfigurationProxy<SimpleF
 	private static String queryTemplateName;
 	
 	static {
-		ResourceRegistryQueryTemplateClient rrqtc = ResourceRegistryQueryTemplateClientFactory.create();
 		try {
+			ResourceRegistryQueryTemplateClient rrqtc = ResourceRegistryQueryTemplateClientFactory.create();
 			queryTemplateName = null;
 			queryTemplateName = installQueryTemplate(rrqtc);
-		} catch (Exception e) {
+		} catch (Throwable e) {
 			logger.error("Unable to install gcat Query Template on FacetBased IS.", e);
 		}
 	}
@@ -89,7 +89,8 @@ public class FacetBasedISConfigurationProxy extends ISConfigurationProxy<SimpleF
 
 	protected static QueryTemplate getQueryTemplate() throws Exception {
 		File queryTemplateFile = getJsonQueryTemplateFromFile(GET_CALLS_FOR_QUERY_TEMPLATE_FILENAME);
-		QueryTemplate queryTemplate = ElementMapper.unmarshal(QueryTemplate.class, new FileReader(queryTemplateFile));
+		FileReader fileReader = new FileReader(queryTemplateFile);
+		QueryTemplate queryTemplate = ElementMapper.unmarshal(QueryTemplate.class, fileReader);
 		return queryTemplate;
 	}