Avoid NPE when no network is found

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@937974 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 5 insertions, 2 deletions

diff --git a/sca-java-2.x/trunk/modules/endpoint-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/RegistryConfig.java b/sca-java-2.x/trunk/modules/endpoint-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/RegistryConfig.java
index da604d717b..c6b1ccaa21 100644
--- a/sca-java-2.x/trunk/modules/endpoint-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/RegistryConfig.java
+++ b/sca-java-2.x/trunk/modules/endpoint-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/RegistryConfig.java
@@ -48,7 +48,7 @@ import java.util.Properties;
  */

 public class RegistryConfig {

     

-    private String bindAddress;

+    private String bindAddress = "*";

     private int bindPort = 14820;

     private boolean multicastDisabled = false;

     private String multicastAddress = "224.5.12.10";

@@ -66,7 +66,10 @@ public class RegistryConfig {
    

         String bindValue = properties.getProperty("bind");

         if (bindValue == null) {

-            this.bindAddress = chooseLocalAddress().getHostAddress();

+            InetAddress addr = chooseLocalAddress();

+            if (addr != null) {

+                this.bindAddress = addr.getHostAddress();

+            }

         } else {

             if (bindValue.indexOf(":") == -1) {

                 this.bindAddress = bindValue;