* RemotingServices.cs: Collect value of parameters with the Out flag into

[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 b3dbef05a623636e84547c3790a1906d4ebfa094..67b1585ccd143c00ef54016499a743ba0d8d10ab 100644 (file)
--- a/mcs/class/corlib/System.Runtime.Remoting/RemotingServices.cs
+++ b/mcs/class/corlib/System.Runtime.Remoting/RemotingServices.cs
@@ -10,6 +10,7 @@
 //
 
 using System;
+using System.Text;
 using System.Reflection;
 using System.Threading;
 using System.Collections;
@@ -55,17 +56,36 @@ 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 {
+                       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
+
+                               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++]; 
+                               }
+                               
+                               result = new ReturnMessage (rval, returnArgs, n, CallContext.CreateLogicalCallContext(), reqMsg);
+                       } 
+                       catch (Exception e) 
+                       {
                                result = new ReturnMessage (e, reqMsg);
                        }
-
+                       
+                       CallContext.RestoreCallContext (oldContext);
                        return result;
                }
 
@@ -211,7 +231,7 @@ namespace System.Runtime.Remoting
                        }
                        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);
                        }
@@ -258,6 +278,25 @@ 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");                      
+               }
+
+               public static void LogRemotingStage (int stage)
+               {
+                       throw new NotImplementedException ();
+               }
+
                [MonoTODO]
                public static string GetSessionIdForMethodMessage(IMethodMessage msg)
                {
@@ -467,7 +506,7 @@ 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);
                }
@@ -506,7 +545,10 @@ namespace System.Runtime.Remoting
                
                internal static void DisposeIdentity (ServerIdentity ident)
                {
-                       uri_hash.Remove (ident.ObjectUri);
+                       lock (uri_hash)
+                       {
+                               uri_hash.Remove (ident.ObjectUri);
+                       }
                }
 
                internal static Identity GetMessageTargetIdentity (IMessage msg)
@@ -527,6 +569,31 @@ 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;
+               }
 
                #endregion
        }