Fixed bug 1209

5 files changed, 14 insertions, 8 deletions

diff --git a/cs/src/IceBox/ServiceManagerI.cs b/cs/src/IceBox/ServiceManagerI.cs
index 5d54598aeac..23b058b7335 100644
--- a/cs/src/IceBox/ServiceManagerI.cs
+++ b/cs/src/IceBox/ServiceManagerI.cs
@@ -48,7 +48,7 @@ class ServiceManagerI : IceBox.ServiceManagerDisp_
 
 	    Ice.Properties properties = Ice.Application.communicator().getProperties();
 
-	    Ice.Identity identity = new Ice.Identity;
+	    Ice.Identity identity = new Ice.Identity();
 	    identity.category = properties.getPropertyWithDefault("IceBox.InstanceName", "IceBox");
 	    identity.name = "ServiceManager";
 	    adapter.add(this, identity);
diff --git a/java/CHANGES b/java/CHANGES
index 77486d7c1d2..9be5209b735 100644
--- a/java/CHANGES
+++ b/java/CHANGES
@@ -3,6 +3,9 @@ NOTE: Please keep changes in the appropriate section for HEAD or 3.1.
 Changes since version 3.1.1 (HEAD)
 ---------------------------     
 
+- If a proxy contains no -h parameter, an Ice client will now attempt
+  to connect using loopback as well as all other local interfaces.
+
 - Added more tracing to the IceSSL plug-in to help debugging the
   TrustOnly properties.
 
diff --git a/java/src/IceBox/Admin.java b/java/src/IceBox/Admin.java
index b1c1c14af0e..4a5713ac88d 100644
--- a/java/src/IceBox/Admin.java
+++ b/java/src/IceBox/Admin.java
@@ -59,8 +59,9 @@ public final class Admin
 
             Ice.Properties properties = communicator().getProperties();
 
-	    String managerIdentity =
-		properties.getPropertyWithDefault("IceBox.InstanceName", "IceBox") + "/ServiceManager";
+	    Ice.Identity managerIdentity = new Ice.Identity();
+	    managerIdentity.category = properties.getPropertyWithDefault("IceBox.InstanceName", "IceBox");
+	    managerIdentity.name = "ServiceManager";
 
 	    String managerProxy;
 	    if(properties.getProperty("Ice.Default.Locator").length() == 0)
@@ -72,7 +73,7 @@ public final class Admin
 		    return 1;
 		}
 
-		managerProxy = managerIdentity + ":" + managerEndpoints;
+		managerProxy = "\"" + communicator().identityToString(managerIdentity) + "\" :" + managerEndpoints;
 	    }
 	    else
 	    {
@@ -83,7 +84,7 @@ public final class Admin
 		    return 1;
 		}
 
-		managerProxy = managerIdentity + ":" + managerAdapterId;
+		managerProxy = "\"" + communicator().identityToString(managerIdentity) + "\" @" + managerAdapterId;
 	    }
 
             Ice.ObjectPrx base = communicator().stringToProxy(managerProxy);
diff --git a/java/src/IceBox/ServiceManagerI.java b/java/src/IceBox/ServiceManagerI.java
index 3c44b25e6e0..0d622b3772b 100644
--- a/java/src/IceBox/ServiceManagerI.java
+++ b/java/src/IceBox/ServiceManagerI.java
@@ -49,8 +49,10 @@ public class ServiceManagerI extends _ServiceManagerDisp
 
 	    Ice.Properties properties = _server.communicator().getProperties();
 
-	    String identity = properties.getPropertyWithDefault("IceBox.InstanceName", "IceBox") + "/ServiceManager";
-	    adapter.add(this, _server.communicator().stringToIdentity(identity));
+	    Ice.Identity identity = new Ice.Identity();
+	    identity.category = properties.getPropertyWithDefault("IceBox.InstanceName", "IceBox");
+	    identity.name = "ServiceManager";
+	    adapter.add(this, identity);
 
 	    //
 	    // Parse the IceBox.LoadOrder property.
diff --git a/java/src/IceGridGUI/Coordinator.java b/java/src/IceGridGUI/Coordinator.java
index 82e865d1984..61f0c2d78c2 100755
--- a/java/src/IceGridGUI/Coordinator.java
+++ b/java/src/IceGridGUI/Coordinator.java
@@ -820,7 +820,7 @@ public class Coordinator
 	    

 	    Ice.Identity routerId = new Ice.Identity();

 	    routerId.category = info.routerInstanceName;

-	    routerId.name = "router"

+	    routerId.name = "router";

 	    String str = "\"" + _communicator.identityToString(routerId) + "\"";

 	    if(!info.routerEndpoints.equals(""))

 	    {