Author: sijskes
Date: Mon Oct 22 11:48:21 2012
New Revision: 1400842
URL: http://svn.apache.org/viewvc?rev=1400842&view=rev
Log:
RIVER-45 it is now possible to implement this behaviour by providing your own
LocalHostLookupProvider.
Modified:
river/jtsk/trunk/src/com/sun/jini/config/ConfigUtil.java
river/jtsk/trunk/src/com/sun/jini/reggie/RegistrarImpl.java
river/jtsk/trunk/src/org/apache/river/config/LocalHostLookup.java
river/jtsk/trunk/src/org/apache/river/config/LocalHostLookupProvider.java
Modified: river/jtsk/trunk/src/com/sun/jini/config/ConfigUtil.java
URL:
http://svn.apache.org/viewvc/river/jtsk/trunk/src/com/sun/jini/config/ConfigUtil.java?rev=1400842&r1=1400841&r2=1400842&view=diff
==============================================================================
--- river/jtsk/trunk/src/com/sun/jini/config/ConfigUtil.java (original)
+++ river/jtsk/trunk/src/com/sun/jini/config/ConfigUtil.java Mon Oct 22
11:48:21 2012
@@ -67,7 +67,7 @@ public class ConfigUtil {
* host could be found.
*/
public static String getHostName() throws UnknownHostException {
- return LocalHostLookup.getLocalHost().getCanonicalHostName();
+ return LocalHostLookup.getHostName();
}
/**
@@ -77,7 +77,7 @@ public class ConfigUtil {
* host could be found.
*/
public static String getHostAddress() throws UnknownHostException {
- return LocalHostLookup.getLocalHost().getHostAddress();
+ return LocalHostLookup.getHostAddress();
}
Modified: river/jtsk/trunk/src/com/sun/jini/reggie/RegistrarImpl.java
URL:
http://svn.apache.org/viewvc/river/jtsk/trunk/src/com/sun/jini/reggie/RegistrarImpl.java?rev=1400842&r1=1400841&r2=1400842&view=diff
==============================================================================
--- river/jtsk/trunk/src/com/sun/jini/reggie/RegistrarImpl.java (original)
+++ river/jtsk/trunk/src/com/sun/jini/reggie/RegistrarImpl.java Mon Oct 22
11:48:21 2012
@@ -4638,7 +4638,7 @@ class RegistrarImpl implements Registrar
} catch (NoSuchEntryException e) {
// fix for 4906732: only invoke getCanonicalHostName if needed
unicastDiscoveryHost =
- LocalHostLookup.getLocalHost().getCanonicalHostName();
+ LocalHostLookup.getHostName();
}
try {
unicastDiscoverySubjectChecker =
Modified: river/jtsk/trunk/src/org/apache/river/config/LocalHostLookup.java
URL:
http://svn.apache.org/viewvc/river/jtsk/trunk/src/org/apache/river/config/LocalHostLookup.java?rev=1400842&r1=1400841&r2=1400842&view=diff
==============================================================================
--- river/jtsk/trunk/src/org/apache/river/config/LocalHostLookup.java (original)
+++ river/jtsk/trunk/src/org/apache/river/config/LocalHostLookup.java Mon Oct
22 11:48:21 2012
@@ -25,6 +25,7 @@ import java.util.logging.Logger;
import org.apache.river.common.Beta;
/**
+ * Provides river with the external host network identity.
*/
@Beta
public class LocalHostLookup
@@ -38,6 +39,16 @@ public class LocalHostLookup
return getProvider().getLocalHost();
}
+ public static String getHostName() throws UnknownHostException
+ {
+ return getProvider().getHostName();
+ }
+
+ public static String getHostAddress() throws UnknownHostException
+ {
+ return getProvider().getHostAddress();
+ }
+
private static synchronized LocalHostLookupProvider getProvider()
{
if( provider == null ) {
@@ -72,6 +83,18 @@ public class LocalHostLookup
{
return InetAddress.getLocalHost();
}
+
+ @Override
+ public String getHostName() throws UnknownHostException
+ {
+ return InetAddress.getLocalHost().getCanonicalHostName();
+ }
+
+ @Override
+ public String getHostAddress() throws UnknownHostException
+ {
+ return InetAddress.getLocalHost().getHostAddress();
+ }
}
Modified:
river/jtsk/trunk/src/org/apache/river/config/LocalHostLookupProvider.java
URL:
http://svn.apache.org/viewvc/river/jtsk/trunk/src/org/apache/river/config/LocalHostLookupProvider.java?rev=1400842&r1=1400841&r2=1400842&view=diff
==============================================================================
--- river/jtsk/trunk/src/org/apache/river/config/LocalHostLookupProvider.java
(original)
+++ river/jtsk/trunk/src/org/apache/river/config/LocalHostLookupProvider.java
Mon Oct 22 11:48:21 2012
@@ -23,9 +23,15 @@ import java.net.UnknownHostException;
import org.apache.river.common.Beta;
/**
+ * Provides a pluggable provider for LocalHostLookup.
*/
@Beta
public interface LocalHostLookupProvider
{
- public InetAddress getLocalHost() throws UnknownHostException ;
+ public InetAddress getLocalHost() throws UnknownHostException ;
+
+ public String getHostName() throws UnknownHostException ;
+
+ public String getHostAddress() throws UnknownHostException ;
+
}
