summaryrefslogtreecommitdiffstats
path: root/catalog-fe/src/main/java
diff options
context:
space:
mode:
authorMichael Lando <ml636r@att.com>2018-08-20 13:45:55 +0300
committerMichael Lando <ml636r@att.com>2018-08-20 13:45:55 +0300
commit2411466fbb0ae49cc0f4de11ccff20f31d5a646e (patch)
tree974aaeec65955ad3a02a8f2f76225e6fb5bd9ef4 /catalog-fe/src/main/java
parentb751c9656c62ec4aa79e7af605dd24cfaeb4d8ad (diff)
fix issue in ui load
in case the plugin response is not valid json. Change-Id: Ib58158def846c14e85325c521b9b210f61e03ba3 Issue-ID: SDC-1666 Signed-off-by: Michael Lando <ml636r@att.com>
Diffstat (limited to 'catalog-fe/src/main/java')
-rw-r--r--catalog-fe/src/main/java/org/openecomp/sdc/fe/impl/PluginStatusBL.java3
-rw-r--r--catalog-fe/src/main/java/org/openecomp/sdc/fe/servlets/ConfigServlet.java2
2 files changed, 4 insertions, 1 deletions
diff --git a/catalog-fe/src/main/java/org/openecomp/sdc/fe/impl/PluginStatusBL.java b/catalog-fe/src/main/java/org/openecomp/sdc/fe/impl/PluginStatusBL.java
index 4d466b1e2d..f4cbe9a70b 100644
--- a/catalog-fe/src/main/java/org/openecomp/sdc/fe/impl/PluginStatusBL.java
+++ b/catalog-fe/src/main/java/org/openecomp/sdc/fe/impl/PluginStatusBL.java
@@ -7,6 +7,7 @@ import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpHead;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients;
+import org.openecomp.sdc.exception.InvalidArgumentException;
import org.openecomp.sdc.fe.config.ConfigurationManager;
import org.openecomp.sdc.fe.config.PluginsConfiguration;
import org.openecomp.sdc.fe.config.PluginsConfiguration.Plugin;
@@ -45,6 +46,8 @@ public class PluginStatusBL {
if (pluginsConfiguration == null || pluginsConfiguration.getPluginsList() == null) {
log.warn("Configuration of type {} was not found", PluginsConfiguration.class);
+ throw new InvalidArgumentException("the plugin configuration was not read successfully.");
+
} else {
log.debug("The value returned from getConfig is {}", pluginsConfiguration);
connectionTimeout = pluginsConfiguration.getConnectionTimeout();
diff --git a/catalog-fe/src/main/java/org/openecomp/sdc/fe/servlets/ConfigServlet.java b/catalog-fe/src/main/java/org/openecomp/sdc/fe/servlets/ConfigServlet.java
index 437123618e..271a3b2d22 100644
--- a/catalog-fe/src/main/java/org/openecomp/sdc/fe/servlets/ConfigServlet.java
+++ b/catalog-fe/src/main/java/org/openecomp/sdc/fe/servlets/ConfigServlet.java
@@ -67,7 +67,7 @@ public class ConfigServlet extends LoggingServlet {
} catch (Exception e) {
FeEcompErrorManager.getInstance().logFeHttpLoggingError("FE Response");
log.error("Unexpected FE response logging error :", e);
- return Response.status(Status.OK).entity(null).build();
+ return Response.status(Status.INTERNAL_SERVER_ERROR).entity("{}").build();
}
}