RESOLVED - bug 326833: [RemoteService][Discovery] ServicePublicationHandler overwrites host name even if URI sets it explicitly

https://bugs.eclipse.org/bugs/show_bug.cgi?id=326833

1 files changed, 10 insertions, 4 deletions

diff --git a/compendium/bundles/org.eclipse.ecf.osgi.services.discovery/src/org/eclipse/ecf/internal/osgi/services/discovery/ServicePublicationHandler.java b/compendium/bundles/org.eclipse.ecf.osgi.services.discovery/src/org/eclipse/ecf/internal/osgi/services/discovery/ServicePublicationHandler.java
index ebed8e607..b9a8517fd 100644
--- a/compendium/bundles/org.eclipse.ecf.osgi.services.discovery/src/org/eclipse/ecf/internal/osgi/services/discovery/ServicePublicationHandler.java
+++ b/compendium/bundles/org.eclipse.ecf.osgi.services.discovery/src/org/eclipse/ecf/internal/osgi/services/discovery/ServicePublicationHandler.java
@@ -423,10 +423,16 @@ public class ServicePublicationHandler implements ServiceTrackerCustomizer,
 				port = 32565;
 		}
 		String host = null;
-		try {
-			host = InetAddress.getLocalHost().getHostAddress();
-		} catch (Exception e) {
-			host = "localhost"; //$NON-NLS-1$
+		if (uri != null) {
+			host = uri.getHost();
+		} else {
+			try {
+				host = InetAddress.getLocalHost().getHostAddress();
+			} catch (Exception e) {
+				logInfo("createURI", //$NON-NLS-1$
+						"failed to get local host adress, falling back to \'localhost\'.", e); //$NON-NLS-1$
+				host = "localhost"; //$NON-NLS-1$
+			}
 		}
 		return new URI(scheme, null, host, port, path, null, null);
 	}