X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=holmes-actions%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fholmes%2Fcommon%2Fconfig%2FMicroServiceConfig.java;h=d86f56ce55c32acd344710f8a73fa3240bbc1bb2;hb=b81ab90bdc2cd6aeebe9b07516a9cb513749d7cd;hp=212bc663b7699c56455a3833b1348246c6f911b0;hpb=3dfe506a8ea1bec7096da63541e426958d04a1a0;p=holmes%2Fcommon.git

diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/config/MicroServiceConfig.java b/holmes-actions/src/main/java/org/onap/holmes/common/config/MicroServiceConfig.java
index 212bc66..d86f56c 100644
--- a/holmes-actions/src/main/java/org/onap/holmes/common/config/MicroServiceConfig.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/config/MicroServiceConfig.java
@@ -98,10 +98,15 @@ public class MicroServiceConfig {
         //String info = getServiceAddrInfoFromCBS(MSB_ADDR);
         String info = getServiceAddrInfoFromCBS(getEnv(HOSTNAME));
         log.info("Got the service information of \"" + getEnv(HOSTNAME) + "\" from CBS. The response is " + info + ".");
-        JSONObject infoObj = JSONObject.fromObject(info);
-        info = infoObj.has("msb.hostname") ? infoObj.getString("msb.hostname") : null;
+
         if (info != null){
-            msbServerInfo = split(info);
+            JSONObject infoObj = JSONObject.fromObject(info);
+            String msbInfoTmp = infoObj.has("msb.hostname") ? infoObj.getString("msb.hostname") : null;
+            if (msbInfoTmp != null) {
+                msbServerInfo = split(msbInfoTmp);
+            } else {
+                msbServerInfo = split(getEnv(MSB_ADDR));
+            }
         } else {
             msbServerInfo = split(getEnv(MSB_ADDR));
         }