X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=rulemgt%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fholmes%2Frulemgt%2FInitializer.java;h=799f455c8c14a7b204217f8be3d24484bc770d2b;hb=refs%2Fchanges%2F41%2F127741%2F1;hp=812ee4800df7635cf746b4ebb0dff5171142162d;hpb=ecf54e8ad1182aa14b5f942160e1834725a432f9;p=holmes%2Frule-management.git

diff --git a/rulemgt/src/main/java/org/onap/holmes/rulemgt/Initializer.java b/rulemgt/src/main/java/org/onap/holmes/rulemgt/Initializer.java
index 812ee48..799f455 100644
--- a/rulemgt/src/main/java/org/onap/holmes/rulemgt/Initializer.java
+++ b/rulemgt/src/main/java/org/onap/holmes/rulemgt/Initializer.java
@@ -30,15 +30,17 @@ import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 import java.util.HashSet;
 import java.util.Set;
+import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 
+import static org.onap.holmes.common.config.MicroServiceConfig.POD_IP;
 import static org.onap.holmes.common.utils.CommonUtils.getEnv;
 import static org.onap.holmes.common.utils.CommonUtils.isIpAddress;
 
 @Service
 public class Initializer {
     private static final Logger logger = LoggerFactory.getLogger(Initializer.class);
-    private static boolean readyForMsbReg = false;
+    private volatile static boolean readyForMsbReg = false;
     private MsbRegister msbRegister;
 
     @Inject
@@ -48,17 +50,19 @@ public class Initializer {
 
     @PostConstruct
     private void init() {
-        waitUntilReady();
-        try {
-            msbRegister.register2Msb(createMicroServiceInfo());
-        } catch (CorrelationException e) {
-            logger.error(e.getMessage(), e);
-        }
+        Executors.newSingleThreadExecutor().execute(() -> {
+            waitUntilReady();
+            try {
+                msbRegister.register2Msb(createMicroServiceInfo());
+            } catch (CorrelationException e) {
+                logger.error(e.getMessage(), e);
+            }
+        });
     }
 
     private void waitUntilReady() {
         int count = 1;
-        while(!readyForMsbReg) {
+        while (!readyForMsbReg) {
             if (count > 20) {
                 break;
             }
@@ -89,7 +93,7 @@ public class Initializer {
         msinfo.setEnable_ssl(CommonUtils.isHttpsEnabled());
         Set<Node> nodes = new HashSet<>();
         Node node = new Node();
-        node.setIp(isIpAddress(serviceIpAndPort[0]) ? serviceIpAndPort[0] : getEnv("HOLMES_RULE_MGMT_SERVICE_HOST"));
+        node.setIp(isIpAddress(serviceIpAndPort[0]) ? serviceIpAndPort[0] : getEnv(POD_IP));
         node.setPort("9101");
         /* Following codes will cause an unregistration from MSB (due to MSB malfunction), comment them for now
         String msbAddrTemplate = (CommonUtils.isHttpsEnabled() ? "https" : "http")