From ef2cb362f32297ca0e365f718d72873ff7176819 Mon Sep 17 00:00:00 2001
From: Luca Frosini <luca.frosini@isti.cnr.it>
Date: Tue, 22 Feb 2022 15:42:53 +0100
Subject: [PATCH] Fixing old and new configuration management

---
 .../configuration/GCoreISConfigurationProxy.java     | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/gcube/gcat/configuration/GCoreISConfigurationProxy.java b/src/main/java/org/gcube/gcat/configuration/GCoreISConfigurationProxy.java
index 90f3ed0..9a8baf1 100644
--- a/src/main/java/org/gcube/gcat/configuration/GCoreISConfigurationProxy.java
+++ b/src/main/java/org/gcube/gcat/configuration/GCoreISConfigurationProxy.java
@@ -102,9 +102,9 @@ public class GCoreISConfigurationProxy {
 		this.mapper = new ObjectMapper();
 	}
 
-	public ServiceCatalogueConfiguration getCatalogueConfiguration() {
+	public ServiceCatalogueConfiguration getCatalogueConfiguration() throws WebApplicationException {
 		if (catalogueConfiguration == null) {
-			catalogueConfiguration = getOLDCatalogueConfigurationFromIS();
+			catalogueConfiguration = getCatalogueConfigurationFromIS();
 		}
 		return catalogueConfiguration;
 	}
@@ -183,12 +183,16 @@ public class GCoreISConfigurationProxy {
 		return serviceEndpoint;
 	}
 	
-	protected ServiceCatalogueConfiguration getCatalogueConfigurationFromIS() throws IOException {
+	protected ServiceCatalogueConfiguration getCatalogueConfigurationFromIS() throws WebApplicationException {
 		ServiceEndpoint serviceEndpoint = getServiceEndpoint();
 		if(serviceEndpoint==null) {
 			return getOLDCatalogueConfigurationFromIS();
 		}
-		return getConfiguration(serviceEndpoint);
+		try {
+			return getConfiguration(serviceEndpoint);
+		}catch (Exception e) {
+			throw new InternalServerErrorException();
+		}
 	}
 	
 	@Deprecated