Merge "Fix NoClassDefFoundError for ServicePluginFactory"

1 files changed, 11 insertions, 6 deletions

diff --git a/bpmn/so-bpmn-infrastructure-common/src/main/java/org/onap/so/bpmn/infrastructure/workflow/service/ServicePluginFactory.java b/bpmn/so-bpmn-infrastructure-common/src/main/java/org/onap/so/bpmn/infrastructure/workflow/service/ServicePluginFactory.java
index 1abe1ccc73..579e7b72df 100644
--- a/bpmn/so-bpmn-infrastructure-common/src/main/java/org/onap/so/bpmn/infrastructure/workflow/service/ServicePluginFactory.java
+++ b/bpmn/so-bpmn-infrastructure-common/src/main/java/org/onap/so/bpmn/infrastructure/workflow/service/ServicePluginFactory.java
@@ -98,12 +98,17 @@ public class ServicePluginFactory {
             new String[] {VS_MONITORED, VS_UNMONITORED, TS_MONITORED, TS_UNMONITORED};
 
     static {
-        try (InputStream is = ClassLoader.class.getResourceAsStream("/application.properties")) {
-            Properties prop = new Properties();
-            prop.load(is);
-            OOF_DEFAULT_ENDPOINT = prop.getProperty("oof.default.endpoint");
-            THIRD_SP_DEFAULT_ENDPOINT = prop.getProperty("third.sp.default.endpoint");
-            INVENTORY_OSS_DEFAULT_ENDPOINT = prop.getProperty("inventory.oss.default.endpoint");
+        try {
+            InputStream is = ClassLoader.class.getResourceAsStream("/application.properties");
+            if (null != is) {
+                Properties prop = new Properties();
+                prop.load(is);
+                OOF_DEFAULT_ENDPOINT = prop.getProperty("oof.default.endpoint");
+                THIRD_SP_DEFAULT_ENDPOINT = prop.getProperty("third.sp.default.endpoint");
+                INVENTORY_OSS_DEFAULT_ENDPOINT = prop.getProperty("inventory.oss.default.endpoint");
+            } else {
+                logger.error("Failed to load property file, Either property file is missing or empty!");
+            }
         } catch (IOException e) {
             logger.error("Failed to load property file!");
         }