2005-01-31 Zoltan Varga <vargaz@freemail.hu>
[mono.git] / mcs / class / corlib / System.Runtime.Remoting / RemotingServices.cs
index ebc163191a0ab4a271ad13078d344dad84f7c3b5..9b35a91a8c7a210f4a7af42df7840236b77883a9 100644 (file)
@@ -9,7 +9,32 @@
 // (C) 2001 Ximian, Inc.  http://www.ximian.com
 //
 
+//
+// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
 using System;
+using System.Diagnostics;
+using System.Text;
 using System.Reflection;
 using System.Threading;
 using System.Collections;
@@ -21,6 +46,7 @@ using System.Runtime.Remoting.Activation;
 using System.Runtime.Remoting.Lifetime;
 using System.Runtime.CompilerServices;
 using System.Runtime.Serialization;
+using System.Runtime.Serialization.Formatters.Binary;
 using System.IO;
 
 namespace System.Runtime.Remoting
@@ -30,20 +56,36 @@ namespace System.Runtime.Remoting
                // Holds the identities of the objects, using uri as index
                static Hashtable uri_hash = new Hashtable ();           
 
+               static BinaryFormatter _serializationFormatter;
+               static BinaryFormatter _deserializationFormatter;
+               
                internal static string app_id;
                static int next_id = 1;
+               static readonly BindingFlags methodBindings = BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic;
+               
+               // Holds information in xdomain calls. Names are short to minimize serialized size.
+               [Serializable]
+               class CACD {
+                       public object d;        /* call data */
+                       public object c;        /* call context */
+               }
                
                static RemotingServices ()
                {
+                       RemotingSurrogateSelector surrogateSelector = new RemotingSurrogateSelector ();
+                       StreamingContext context = new StreamingContext (StreamingContextStates.Remoting, null);
+                       _serializationFormatter = new BinaryFormatter (surrogateSelector, context);
+                       _deserializationFormatter = new BinaryFormatter (null, context);
+                       
                        RegisterInternalChannels ();
-                       app_id = "/" + Guid.NewGuid().ToString().Replace('-', '_') + "/";
+                       app_id = Guid.NewGuid().ToString().Replace('-', '_') + "/";
                        CreateWellKnownServerIdentity (typeof(RemoteActivator), "RemoteActivationService.rem", WellKnownObjectMode.Singleton);
                }
        
                private RemotingServices () {}
 
                [MethodImplAttribute(MethodImplOptions.InternalCall)]
-               internal extern static object InternalExecute (MonoMethod method, Object obj,
+               internal extern static object InternalExecute (MethodBase method, Object obj,
                                                               Object[] parameters, out object [] out_args);
 
                [MethodImplAttribute(MethodImplOptions.InternalCall)]
@@ -54,18 +96,42 @@ namespace System.Runtime.Remoting
                {
                        ReturnMessage result;
                        
-                       MonoMethod method = (MonoMethod) target.GetType().GetMethod(reqMsg.MethodName, BindingFlags.Public|BindingFlags.NonPublic|BindingFlags.Instance, null, (Type[]) reqMsg.MethodSignature, null);
-
-                       try {
+                       Type tt = target.GetType ();
+                       MethodBase method = reqMsg.MethodBase.DeclaringType == tt ? reqMsg.MethodBase : tt.GetMethod(reqMsg.MethodName, BindingFlags.Public|BindingFlags.NonPublic|BindingFlags.Instance, null, (Type[]) reqMsg.MethodSignature, null);
+                       object oldContext = CallContext.SetCurrentCallContext (reqMsg.LogicalCallContext);
+                       
+                       try 
+                       {
                                object [] out_args;
                                object rval = InternalExecute (method, target, reqMsg.Args, out out_args);
-                               result = new ReturnMessage (rval, out_args, out_args.Length,
-                                                           reqMsg.LogicalCallContext, reqMsg);
                        
-                       } catch (Exception e) {
+                               // Collect parameters with Out flag from the request message
+                               // FIXME: This can be done in the unmanaged side and will be
+                               // more efficient
+                               
+                               ParameterInfo[] parameters = method.GetParameters();
+                               object[] returnArgs = new object [parameters.Length];
+                               
+                               int n = 0;
+                               int noa = 0;
+                               foreach (ParameterInfo par in parameters)
+                               {
+                                       if (par.IsOut && !par.ParameterType.IsByRef) 
+                                               returnArgs [n++] = reqMsg.GetArg (par.Position);
+                                       else if (par.ParameterType.IsByRef)
+                                               returnArgs [n++] = out_args [noa++]; 
+                                       else
+                                               returnArgs [n++] = null; 
+                               }
+                               
+                               result = new ReturnMessage (rval, returnArgs, n, CallContext.CreateLogicalCallContext (true), reqMsg);
+                       } 
+                       catch (Exception e) 
+                       {
                                result = new ReturnMessage (e, reqMsg);
                        }
-
+                       
+                       CallContext.RestoreCallContext (oldContext);
                        return result;
                }
 
@@ -109,10 +175,12 @@ namespace System.Runtime.Remoting
                                if (proxy.GetProxiedType().IsContextful && (proxy.ObjectIdentity is ServerIdentity))
                                        identity = proxy.ObjectIdentity as ServerIdentity;
                                else
-                                       throw new ArgumentException ("The obj parameter is a proxy");
+                                       throw new ArgumentException ("The obj parameter is a proxy.");
                        }
-                       else
+                       else {
                                identity = obj.ObjectIdentity;
+                               obj.ObjectIdentity = null;
+                       }
 
                        if (identity == null || !identity.IsConnected)
                                return false;
@@ -126,7 +194,7 @@ namespace System.Runtime.Remoting
 
                public static Type GetServerTypeForUri (string uri)
                {
-                       Identity ident = GetIdentityForUri (uri);
+                       ServerIdentity ident = GetIdentityForUri (uri) as ServerIdentity;
                        if (ident == null) return null;
                        return ident.ObjectType;
                }
@@ -134,7 +202,8 @@ namespace System.Runtime.Remoting
                public static string GetObjectUri (MarshalByRefObject obj)
                {
                        Identity ident = GetObjectIdentity(obj);
-                       if (ident != null) return ident.ObjectUri;
+                       if (ident is ClientIdentity) return ((ClientIdentity)ident).TargetUri;
+                       else if (ident != null) return ident.ObjectUri;
                        else return null;
                }
 
@@ -145,9 +214,8 @@ namespace System.Runtime.Remoting
 
                public static object Unmarshal (ObjRef objref, bool fRefine)
                {
-                       // FIXME: use type name when fRefine==true
-
                        Type classToProxy = fRefine ? objref.ServerType : typeof (MarshalByRefObject);
+                       if (classToProxy == null) classToProxy = typeof (MarshalByRefObject);
 
                        if (objref.IsReferenceToWellKnow)
                                return GetRemoteObject(objref, classToProxy);
@@ -183,7 +251,7 @@ namespace System.Runtime.Remoting
 
                                if (identity != null)
                                {
-                                       if (identity.ObjectType.IsContextful && !identity.IsConnected)
+                                       if (proxy.GetProxiedType().IsContextful && !identity.IsConnected)
                                        {
                                                // Unregistered local contextbound object. Register now.
                                                ClientActivatedIdentity cboundIdentity = (ClientActivatedIdentity)identity;
@@ -194,7 +262,7 @@ namespace System.Runtime.Remoting
                                                return cboundIdentity.CreateObjRef(requested_type);
                                        }
                                        else if (uri != null)
-                                               throw new RemotingException ("It is not possible marshal a proxy of a remote object");
+                                               throw new RemotingException ("It is not possible marshal a proxy of a remote object.");
 
                                        return proxy.ObjectIdentity.CreateObjRef(requested_type);
                                }
@@ -204,27 +272,34 @@ namespace System.Runtime.Remoting
 
                        if (uri == null) 
                        {
-                               uri = NewUri();
-                               CreateClientActivatedServerIdentity (obj, requested_type, uri);
+                               if (obj.ObjectIdentity == null)
+                               {
+                                       uri = NewUri();
+                                       CreateClientActivatedServerIdentity (obj, requested_type, uri);
+                               }
                        }
                        else
                        {
-                               ClientActivatedIdentity identity = uri_hash [uri] as ClientActivatedIdentity;
+                               ClientActivatedIdentity identity = GetIdentityForUri ("/" + uri) as ClientActivatedIdentity;
                                if (identity == null || obj != identity.GetServerObject()) 
                                        CreateClientActivatedServerIdentity (obj, requested_type, uri);
                        }
 
-                       return obj.CreateObjRef(requested_type);
+                       if (IsTransparentProxy (obj))
+                               return RemotingServices.GetRealProxy(obj).ObjectIdentity.CreateObjRef (requested_type);
+                       else
+                               return obj.CreateObjRef(requested_type);
                }
 
                static string NewUri ()
                {
-                       return app_id + Environment.TickCount + "_" + next_id++;
+                       int n = Interlocked.Increment (ref next_id);
+                       return app_id + Environment.TickCount + "_" + n + ".rem";
                }
 
                public static RealProxy GetRealProxy (object proxy)
                {
-                       if (!IsTransparentProxy(proxy)) throw new RemotingException("Cannot get the real proxy from an object that is not a transparent proxy");
+                       if (!IsTransparentProxy(proxy)) throw new RemotingException("Cannot get the real proxy from an object that is not a transparent proxy.");
                        return (RealProxy)((TransparentProxy)proxy)._rp;
                }
 
@@ -232,13 +307,50 @@ namespace System.Runtime.Remoting
                {
                        Type type = Type.GetType (msg.TypeName);
                        if (type == null)
-                               throw new RemotingException ("Type '" + msg.TypeName + "' not found!");
-
-                       BindingFlags bflags = BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic;
-                       if (msg.MethodSignature == null)
-                               return type.GetMethod (msg.MethodName, bflags);
+                               throw new RemotingException ("Type '" + msg.TypeName + "' not found.");
+                               
+                       return GetMethodBaseFromName (type, msg.MethodName, (Type[]) msg.MethodSignature);
+               }
+               
+               internal static MethodBase GetMethodBaseFromName (Type type, string methodName, Type[] signature)
+               {
+                       if (type.IsInterface) {
+                               return FindInterfaceMethod (type, methodName, signature);
+                       }
+                       else {
+                               MethodBase method = null;
+                               if (signature == null)
+                                       method = type.GetMethod (methodName, methodBindings);
+                               else
+                                       method = type.GetMethod (methodName, methodBindings, null, (Type[]) signature, null);
+                               
+                               if (method != null) 
+                                       return method;
+                               
+                               if (signature == null)
+                                       return type.GetConstructor (methodBindings, null, Type.EmptyTypes, null);
+                               else
+                                       return type.GetConstructor (methodBindings, null, signature, null);
+                       }
+               }
+               
+               static MethodBase FindInterfaceMethod (Type type, string methodName, Type[] signature)
+               {
+                       MethodBase method = null;
+                       
+                       if (signature == null)
+                               method = type.GetMethod (methodName, methodBindings);
                        else
-                               return type.GetMethod (msg.MethodName, bflags, null, (Type[]) msg.MethodSignature, null);
+                               method = type.GetMethod (methodName, methodBindings, null, signature, null);
+                               
+                       if (method != null) return method;
+                       
+                       foreach (Type t in type.GetInterfaces ()) {
+                               method = FindInterfaceMethod (t, methodName, signature);
+                               if (method != null) return method;
+                       }
+                       
+                       return null;
                }
 
                public static void GetObjectData(object obj, SerializationInfo info, StreamingContext context)
@@ -256,41 +368,64 @@ namespace System.Runtime.Remoting
                        else return ident.CreateObjRef(null);
                }
 
+               public static object GetLifetimeService (MarshalByRefObject obj)
+               {
+                       if (obj == null) return null;
+                       return obj.GetLifetimeService ();
+               }
+
+               public static IMessageSink GetEnvoyChainForProxy (MarshalByRefObject obj)
+               {
+                       if (IsTransparentProxy(obj))
+                               return ((ClientIdentity)GetRealProxy (obj).ObjectIdentity).EnvoySink;
+                       else
+                               throw new ArgumentException ("obj must be a proxy.","obj");                     
+               }
+
                [MonoTODO]
+               [Conditional ("REMOTING_PERF")]
+               public static void LogRemotingStage (int stage)
+               {
+                       throw new NotImplementedException ();
+               }
+
                public static string GetSessionIdForMethodMessage(IMethodMessage msg)
                {
-                       throw new NotImplementedException (); 
+                       // It seems that this it what MS returns.
+                       return msg.Uri;
                }
 
                public static bool IsMethodOverloaded(IMethodMessage msg)
                {
-                       Type type = msg.MethodBase.DeclaringType;
-                       MemberInfo[] members = type.GetMember (msg.MethodName, MemberTypes.Method, BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance);
-                       return members.Length > 1;
+                       const BindingFlags bfinst = BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance;
+                       MonoType type = (MonoType) msg.MethodBase.DeclaringType;
+                       return type.GetMethodsByName (msg.MethodName, bfinst, false, type).Length > 1;
                }
 
                public static bool IsObjectOutOfAppDomain(object tp)
                {
+                       // TODO: use internal call for better performance
                        Identity ident = GetObjectIdentity((MarshalByRefObject)tp);
-                       if (ident != null) return !ident.IsFromThisAppDomain;
-                       else return false;
+                       return ident is ClientIdentity;
                }
 
                public static bool IsObjectOutOfContext(object tp)
                {
-                       ServerIdentity ident = GetObjectIdentity((MarshalByRefObject)tp) as ServerIdentity;
-                       if (ident != null) return ident.Context != System.Threading.Thread.CurrentContext;
-                       else return false;
+                       // TODO: use internal call for better performance
+                       Identity ident = GetObjectIdentity((MarshalByRefObject)tp);
+                       if (ident == null) return false;
+                       
+                       ServerIdentity sident = ident as ServerIdentity;
+                       if (sident != null) return sident.Context != System.Threading.Thread.CurrentContext;
+                       else return true;
                }
 
                public static bool IsOneWay(MethodBase method)
                {
-                       // TODO: use internal call for better performance
-                       object[] atts = method.GetCustomAttributes (typeof (OneWayAttribute), false);
-                       return atts.Length > 0;
+                       return method.IsDefined (typeof (OneWayAttribute), false);
                }
 
-               public static bool IsAsyncMessage(IMessage msg)
+               internal static bool IsAsyncMessage(IMessage msg)
                {
                        if (! (msg is MonoMethodMessage)) return false;
                        else if (((MonoMethodMessage)msg).IsAsync) return true;
@@ -300,7 +435,14 @@ namespace System.Runtime.Remoting
 
                public static void SetObjectUriForMarshal(MarshalByRefObject obj, string uri)
                {
-                       if (IsTransparentProxy (obj)) throw new RemotingException ("SetObjectUriForMarshal method should only be called for MarshalByRefObjects that exist in the current AppDomain.");
+                       if (IsTransparentProxy (obj)) {
+                               RealProxy proxy = RemotingServices.GetRealProxy(obj);
+                               Identity identity = proxy.ObjectIdentity;
+
+                               if (identity != null && !(identity is ServerIdentity) && !proxy.GetProxiedType().IsContextful)
+                                       throw new RemotingException ("SetObjectUriForMarshal method should only be called for MarshalByRefObjects that exist in the current AppDomain.");
+                       }
+                       
                        Marshal (obj, uri);
                }
 
@@ -352,7 +494,7 @@ namespace System.Runtime.Remoting
                {
                        lock (uri_hash)
                        {
-                               return (Identity)uri_hash [uri];
+                               return (Identity)uri_hash [GetNormalizedUri(uri)];
                        }
                }
 
@@ -364,7 +506,7 @@ namespace System.Runtime.Remoting
                                return obj.ObjectIdentity;
                }
 
-               internal static ClientIdentity GetOrCreateClientIdentity(ObjRef objRef, Type proxyType)
+               internal static ClientIdentity GetOrCreateClientIdentity(ObjRef objRef, Type proxyType, out object clientProxy)
                {
                        // This method looks for an identity for the given url. 
                        // If an identity is not found, it creates the identity and 
@@ -374,32 +516,48 @@ namespace System.Runtime.Remoting
                        // It will also get the object uri from the url.
 
                        object channelData = objRef.ChannelInfo != null ? objRef.ChannelInfo.ChannelData : null;
-                       string url = (channelData == null) ? objRef.URI : null;
 
                        string objectUri;
-                       IMessageSink sink = GetClientChannelSinkChain (url, channelData, out objectUri);
+                       IMessageSink sink = GetClientChannelSinkChain (objRef.URI, channelData, out objectUri);
 
                        if (objectUri == null) objectUri = objRef.URI;
 
                        lock (uri_hash)
                        {
-                               ClientIdentity identity = uri_hash [objRef.URI] as ClientIdentity;
-                               if (identity != null) 
-                                       return identity;        // Object already registered
+                               clientProxy = null;
+                               string uri = GetNormalizedUri (objRef.URI);
+                               
+                               ClientIdentity identity = uri_hash [uri] as ClientIdentity;
+                               if (identity != null)
+                               {
+                                       // Object already registered
+                                       clientProxy = identity.ClientProxy;
+                                       if (clientProxy != null) return identity;
+                                       
+                                       // The proxy has just been GCed, so its identity cannot
+                                       // be reused. Just dispose it.
+                                       DisposeIdentity (identity);
+                               }
 
                                // Creates an identity and a proxy for the remote object
 
                                identity = new ClientIdentity (objectUri, objRef);
                                identity.ChannelSink = sink;
 
+                               // Registers the identity
+                               uri_hash [uri] = identity;
+                               
                                if (proxyType != null)
                                {
                                        RemotingProxy proxy = new RemotingProxy (proxyType, identity);
-                                       identity.ClientProxy = (MarshalByRefObject) proxy.GetTransparentProxy();
+                                       CrossAppDomainSink cds = sink as CrossAppDomainSink;
+                                       if (cds != null)
+                                               proxy.SetTargetDomain (cds.TargetDomainId);
+
+                                       clientProxy = proxy.GetTransparentProxy();
+                                       identity.ClientProxy = (MarshalByRefObject) clientProxy;
                                }
 
-                               // Registers the identity
-                               uri_hash [objRef.URI] = identity;
                                return identity;
                        }
                }
@@ -409,12 +567,12 @@ namespace System.Runtime.Remoting
                        IMessageSink sink = ChannelServices.CreateClientChannelSinkChain (url, channelData, out objectUri);
                        if (sink == null) 
                        {
-                               if (url != null) \r
+                               if (url != null) 
                                {
                                        string msg = String.Format ("Cannot create channel sink to connect to URL {0}. An appropriate channel has probably not been registered.", url); 
                                        throw new RemotingException (msg);
                                }
-                               else \r
+                               else 
                                {
                                        string msg = String.Format ("Cannot create channel sink to connect to the remote object. An appropriate channel has probably not been registered.", url); 
                                        throw new RemotingException (msg);
@@ -457,7 +615,7 @@ namespace System.Runtime.Remoting
                        lock (uri_hash)
                        {
                                if (uri_hash.ContainsKey (identity.ObjectUri)) 
-                                       throw new RemotingException ("Uri already in use: " + identity.ObjectUri);
+                                       throw new RemotingException ("Uri already in use: " + identity.ObjectUri + ".");
 
                                uri_hash[identity.ObjectUri] = identity;
                        }
@@ -465,32 +623,113 @@ namespace System.Runtime.Remoting
 
                internal static object GetProxyForRemoteObject (ObjRef objref, Type classToProxy)
                {
-                       ClientActivatedIdentity identity = uri_hash [objref.URI] as ClientActivatedIdentity;
+                       ClientActivatedIdentity identity = GetIdentityForUri (objref.URI) as ClientActivatedIdentity;
                        if (identity != null) return identity.GetServerObject ();
                        else return GetRemoteObject (objref, classToProxy);
                }
 
                internal static object GetRemoteObject(ObjRef objRef, Type proxyType)
                {
-                       ClientIdentity id = GetOrCreateClientIdentity (objRef, proxyType);
-                       return id.ClientProxy;
+                       object proxy;
+                       GetOrCreateClientIdentity (objRef, proxyType, out proxy);
+                       return proxy;
+               }
+               
+               // This method is called by the runtime
+               internal static object GetServerObject (string uri)
+               {
+                       ClientActivatedIdentity identity = GetIdentityForUri (uri) as ClientActivatedIdentity;
+                       if (identity == null) throw new RemotingException ("Server for uri '" + uri + "' not found");
+                       return identity.GetServerObject ();
                }
 
+               // This method is called by the runtime
+               internal static byte[] SerializeCallData (object obj)
+               {
+                       LogicalCallContext ctx = CallContext.CreateLogicalCallContext (false);
+                       if (ctx != null) {
+                               CACD cad = new CACD ();
+                               cad.d = obj;
+                               cad.c = ctx;
+                               obj = cad;
+                       }
+                       
+                       if (obj == null) return null;
+                       MemoryStream ms = new MemoryStream ();
+                       _serializationFormatter.Serialize (ms, obj);
+                       return ms.ToArray ();
+               }
+
+               // This method is called by the runtime
+               internal static object DeserializeCallData (byte[] array)
+               {
+                       if (array == null) return null;
+                       
+                       MemoryStream ms = new MemoryStream (array);
+                       object obj = _deserializationFormatter.Deserialize (ms);
+                       
+                       if (obj is CACD) {
+                               CACD cad = (CACD) obj;
+                               obj = cad.d;
+                               CallContext.UpdateCurrentCallContext ((LogicalCallContext) cad.c);
+                       }
+                       return obj;
+               }
+               
+               // This method is called by the runtime
+               internal static byte[] SerializeExceptionData (Exception ex)
+               {
+                       try {
+                               int retry = 4;
+                               
+                               do {
+                                       try {
+                                               MemoryStream ms = new MemoryStream ();
+                                               _serializationFormatter.Serialize (ms, ex);
+                                               return ms.ToArray ();
+                                       }
+                                       catch (Exception e) {
+                                               if (e is ThreadAbortException) {
+                                                       Thread.ResetAbort ();
+                                                       retry = 5;
+                                                       ex = e;
+                                               }
+                                               else if (retry == 2) {
+                                                       ex = new Exception ();
+                                                       ex.SetMessage (e.Message);
+                                                       ex.SetStackTrace (e.StackTrace);
+                                               }
+                                               else
+                                                       ex = e;
+                                       }
+                                       retry--;
+                               }
+                               while (retry > 0);
+                               
+                               return null;
+                       }
+                       catch (Exception tex)
+                       {
+                               byte[] data = SerializeExceptionData (tex);
+                               Thread.ResetAbort ();
+                               return data;
+                       }
+               }
+               
                internal static object GetDomainProxy(AppDomain domain) 
                {
                        byte[] data = null;
 
                        Context currentContext = Thread.CurrentContext;
-                       AppDomain currentDomain = AppDomain.InternalSetDomain (domain);
-                       try 
+
+                       try
                        {
-                               data = domain.GetMarshalledDomainObjRef ();
+                               data = (byte[])AppDomain.InvokeInDomain (domain, typeof (AppDomain).GetMethod ("GetMarshalledDomainObjRef", BindingFlags.Instance|BindingFlags.NonPublic), domain, null);
                        }
-                       finally 
+                       finally
                        {
-                               AppDomain.InternalSetDomain (currentDomain);
                                AppDomain.InternalSetContext (currentContext);
-                       }
+                       }                               
 
                        MemoryStream stream = new MemoryStream (data);
                        ObjRef appref = (ObjRef) CADSerializer.DeserializeObject (stream);
@@ -502,9 +741,20 @@ namespace System.Runtime.Remoting
                        CrossAppDomainChannel.RegisterCrossAppDomainChannel();
                }
                
-               internal static void DisposeIdentity (ServerIdentity ident)
+               internal static void DisposeIdentity (Identity ident)
                {
-                       uri_hash.Remove (ident.ObjectUri);
+                       lock (uri_hash)
+                       {
+                               if (!ident.Disposed) {
+                                       ClientIdentity clientId = ident as ClientIdentity;
+                                       if (clientId != null)
+                                               uri_hash.Remove (GetNormalizedUri (clientId.TargetUri));
+                                       else
+                                               uri_hash.Remove (ident.ObjectUri);
+                                               
+                                       ident.Disposed = true;
+                               }
+                       }
                }
 
                internal static Identity GetMessageTargetIdentity (IMessage msg)
@@ -516,7 +766,8 @@ namespace System.Runtime.Remoting
 
                        lock (uri_hash)
                        {
-                               return uri_hash [((IMethodMessage)msg).Uri] as ServerIdentity;
+                               string uri = GetNormalizedUri (((IMethodMessage)msg).Uri);
+                               return uri_hash [uri] as ServerIdentity;
                        }
                }
 
@@ -525,6 +776,37 @@ namespace System.Runtime.Remoting
                        if (msg is IInternalMessage) 
                                ((IInternalMessage)msg).TargetIdentity = ident;
                }
+               
+               internal static bool UpdateOutArgObject (ParameterInfo pi, object local, object remote)
+               {
+                       if (local is StringBuilder) 
+                       {
+                               StringBuilder sb = local as StringBuilder;
+                               sb.Remove (0, sb.Length);
+                               sb.Append (remote.ToString());
+                               return true;
+                       }
+                       else if (pi.ParameterType.IsArray && ((Array)local).Rank == 1)
+                       {
+                               Array alocal = (Array) local;
+                               if (alocal.Rank == 1)
+                               {
+                                       Array.Copy ((Array) remote, alocal, alocal.Length);
+                                       return true;
+                               }
+                               else
+                               {
+                                       // TODO
+                               }
+                       }
+                       return false;
+               }
+               
+               static string GetNormalizedUri (string uri)
+               {
+                       if (uri.StartsWith ("/")) return uri.Substring (1);
+                       else return uri;
+               }
 
                #endregion
        }