2006-11-22 Lluis Sanchez Gual <lluis@novell.com>

[mono.git] / mcs / class / corlib / System.Runtime.Remoting / RemotingServices.cs

diff --git a/mcs/class/corlib/System.Runtime.Remoting/RemotingServices.cs b/mcs/class/corlib/System.Runtime.Remoting/RemotingServices.cs
index 5f66ef23c3ed1c6fbaac1fc0e71e8591a1a80499..69467cadfa481c6bc4291ad2bea137e2114d6216 100644 (file)
--- a/mcs/class/corlib/System.Runtime.Remoting/RemotingServices.cs
+++ b/mcs/class/corlib/System.Runtime.Remoting/RemotingServices.cs
@@ -326,7 +326,7 @@ namespace System.Runtime.Remoting
                static string NewUri ()
                {
                        int n = Interlocked.Increment (ref next_id);
-                       return app_id + Environment.TickCount + "_" + n + ".rem";
+                       return app_id + Environment.TickCount.ToString("x") + "_" + n + ".rem";
                }
 
 #if NET_2_0
@@ -508,7 +508,10 @@ namespace System.Runtime.Remoting
        
                internal static object CreateClientProxy (Type objectType, string url, object[] activationAttributes)
                {
-                       string activationUrl = url + "/RemoteActivationService.rem";
+                       string activationUrl = url;
+                       if (!activationUrl.EndsWith ("/"))
+                               activationUrl += "/";
+                       activationUrl += "RemoteActivationService.rem";
 
                        string objectUri;
                        GetClientChannelSinkChain (activationUrl, null, out objectUri);