You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by an...@apache.org on 2010/04/26 11:16:38 UTC

svn commit: r937974 - /tuscany/sca-java-2.x/trunk/modules/endpoint-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/RegistryConfig.java

Author: antelder
Date: Mon Apr 26 09:16:26 2010
New Revision: 937974

URL: http://svn.apache.org/viewvc?rev=937974&view=rev
Log:
Avoid NPE when no network is found

Modified:
    tuscany/sca-java-2.x/trunk/modules/endpoint-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/RegistryConfig.java

Modified: tuscany/sca-java-2.x/trunk/modules/endpoint-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/RegistryConfig.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/endpoint-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/RegistryConfig.java?rev=937974&r1=937973&r2=937974&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/endpoint-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/RegistryConfig.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/endpoint-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/RegistryConfig.java Mon Apr 26 09:16:26 2010
@@ -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;