Revision: 3447
http://bigdata.svn.sourceforge.net/bigdata/?rev=3447&view=rev
Author: dmacgbr
Date: 2010-08-18 20:04:48 +0000 (Wed, 18 Aug 2010)
Log Message:
-----------
Trac ticket #144 - Obtain host IP address at the time that service config file is written by JiniServiceStarter rather than at the time that the enclosing JiniServiceConfiguration is instantiated.
Modified Paths:
--------------
trunk/bigdata-jini/src/java/com/bigdata/jini/start/config/JiniServiceConfiguration.java
Modified: trunk/bigdata-jini/src/java/com/bigdata/jini/start/config/JiniServiceConfiguration.java
===================================================================
--- trunk/bigdata-jini/src/java/com/bigdata/jini/start/config/JiniServiceConfiguration.java 2010-08-18 11:40:10 UTC (rev 3446)
+++ trunk/bigdata-jini/src/java/com/bigdata/jini/start/config/JiniServiceConfiguration.java 2010-08-18 20:04:48 UTC (rev 3447)
@@ -34,7 +34,6 @@
import java.io.OutputStreamWriter;
import java.io.StringWriter;
import java.io.Writer;
-import java.net.InetAddress;
import java.util.Arrays;
import java.util.Date;
import java.util.Enumeration;
@@ -131,8 +130,6 @@
public final Properties properties;
public final String[] jiniOptions;
- private final String serviceIpAddr;
-
protected void toString(StringBuilder sb) {
super.toString(sb);
@@ -178,12 +175,6 @@
} else {
log.warn("groups = " + Arrays.toString(this.groups));
}
-
- try {
- this.serviceIpAddr = NicUtil.getIpAddress("default.nic", "default", false);
- } catch(IOException e) {
- throw new ConfigurationException(e.getMessage(), e);
- }
}
/**
@@ -480,6 +471,9 @@
final ServiceDir serviceDir = new ServiceDir(this.serviceDir);
+ String serviceIpAddr = NicUtil.getIpAddress ( "default.nic", "default", false ) ;
+ if ( null == serviceIpAddr )
+ throw new IOException ( "Can't get a host ip address" ) ;
final Hostname hostName = new Hostname(serviceIpAddr);
final ServiceUUID serviceUUID = new ServiceUUID(this.serviceUUID);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
