2 files changed, 19 insertions, 3 deletions

diff --git a/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/aai/AaiCommon.java b/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/aai/AaiCommon.java
index d28d5e5..15820c5 100644
--- a/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/aai/AaiCommon.java
+++ b/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/aai/AaiCommon.java
@@ -16,7 +16,11 @@
 package org.onap.aai.esr.externalservice.aai;
 
 public class AaiCommon {
-
+	
+	private AaiCommon() {
+		
+	}
+	
     private static String AAI_AUTHENTICATION_USER = "AAI";
     private static String AAI_AUTHENTICATION_PAASWORD = "AAI";
 
diff --git a/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/msb/MsbHelper.java b/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/msb/MsbHelper.java
index 7452937..41c9d91 100644
--- a/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/msb/MsbHelper.java
+++ b/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/msb/MsbHelper.java
@@ -16,16 +16,23 @@
 package org.onap.aai.esr.externalservice.msb;
 
 import java.net.InetAddress;
+import java.net.UnknownHostException;
 import java.util.HashSet;
 import java.util.Set;
+import org.onap.aai.esr.exception.ExceptionUtil;
+import org.onap.msb.sdk.discovery.common.RouteException;
 import org.onap.msb.sdk.discovery.entity.MicroServiceInfo;
 import org.onap.msb.sdk.httpclient.msb.MSBServiceClient;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.onap.msb.sdk.discovery.entity.Node;
 
 public class MsbHelper {
 
     private MSBServiceClient msbClient;
 
+    private static final Logger LOG = LoggerFactory.getLogger(MsbHelper.class);
+    
     public MsbHelper(MSBServiceClient msbClient) {
         super();
         this.msbClient = msbClient;
@@ -33,7 +40,7 @@ public class MsbHelper {
 
 
 
-    public void registerMsb() throws Exception {
+    public void registerMsb() throws RouteException {
 
 
         MicroServiceInfo msinfo = new MicroServiceInfo();
@@ -46,7 +53,12 @@ public class MsbHelper {
 
         Set<Node> nodes = new HashSet<>();
         Node node1 = new Node();
-        node1.setIp(InetAddress.getLocalHost().getHostAddress());
+        try {
+            node1.setIp(InetAddress.getLocalHost().getHostAddress());
+        } catch (UnknownHostException e) {
+            LOG.error("Got localhost failed when register service to MSB!", e);
+            throw ExceptionUtil.buildExceptionResponse(e.getMessage());
+        }
         node1.setPort("9518");
         nodes.add(node1);
         msinfo.setNodes(nodes);