Merge pull request #820 from brendanzagaeski/master

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

diff --git a/mcs/class/corlib/System.Runtime.Remoting.Proxies/RealProxy.cs b/mcs/class/corlib/System.Runtime.Remoting.Proxies/RealProxy.cs
index 8c62f24335389f6703459dcc212e9d8785ad50cd..d430e9ccc1d505f0815f4d5c0100f7bf8d9d60d8 100644 (file)
--- a/mcs/class/corlib/System.Runtime.Remoting.Proxies/RealProxy.cs
+++ b/mcs/class/corlib/System.Runtime.Remoting.Proxies/RealProxy.cs
@@ -40,27 +40,28 @@ using System.Runtime.Remoting.Activation;
 using System.Runtime.Remoting.Contexts;
 using System.Runtime.CompilerServices;
 using System.Runtime.Serialization;
-
-#if NET_2_0
 using System.Runtime.InteropServices;
-#endif
 
 namespace System.Runtime.Remoting.Proxies
 {
+#pragma warning disable 169, 649
+       [StructLayout (LayoutKind.Sequential)]
        internal class TransparentProxy {
                public RealProxy _rp;
                IntPtr _class;
                bool _custom_type_info;
        }
+#pragma warning restore 169, 649
        
-#if NET_2_0
        [ComVisible (true)]
-#endif
+       [StructLayout (LayoutKind.Sequential)]
        public abstract class RealProxy {
                // other classes visible to the runtime 
                // derive from this class so keep these locals
                // in sync with the definition RealProxy 
                // in object-internals.h
+               
+#pragma warning disable 169, 414               
                #region Sync with object-internals.h
                Type class_to_proxy;
                internal Context _targetContext;
@@ -68,9 +69,10 @@ namespace System.Runtime.Remoting.Proxies
                int _targetDomainId = -1;
                internal string _targetUri;
                internal Identity _objectIdentity;
-               Object _objTP;\r
-               object _stubData;\r
+               Object _objTP;
+               object _stubData;
         #endregion
+#pragma warning restore 169, 414
 
                protected RealProxy ()
                {
@@ -115,8 +117,8 @@ namespace System.Runtime.Remoting.Proxies
 
                public virtual void GetObjectData (SerializationInfo info, StreamingContext context)
                {
-                       Object obj = GetTransparentProxy();\r
-                       RemotingServices.GetObjectData (obj, info, context);            \r
+                       Object obj = GetTransparentProxy();
+                       RemotingServices.GetObjectData (obj, info, context);            
                }
                
                internal Identity ObjectIdentity
@@ -164,9 +166,10 @@ namespace System.Runtime.Remoting.Proxies
                        CallType call_type = mMsg.CallType;
                        bool is_remproxy = (rp is RemotingProxy);
 
+                       out_args = null;
                        IMethodReturnMessage res_msg = null;
                        
-                       if (call_type == CallType.BeginInvoke) \r
+                       if (call_type == CallType.BeginInvoke) 
                                // todo: set CallMessage in runtime instead
                                mMsg.AsyncResult.CallMessage = mMsg;
 
@@ -174,34 +177,48 @@ namespace System.Runtime.Remoting.Proxies
                                res_msg = (IMethodReturnMessage)mMsg.AsyncResult.EndInvoke ();
 
                        // Check for constructor msg
-                       if (mMsg.MethodBase.IsConstructor) \r
+                       if (mMsg.MethodBase.IsConstructor) 
                        {
-                               if (is_remproxy) \r
+                               if (is_remproxy) 
                                        res_msg = (IMethodReturnMessage) (rp as RemotingProxy).ActivateRemoteObject ((IMethodMessage) msg);
-                               else \r
+                               else 
                                        msg = new ConstructionCall (rp.GetProxiedType ());
                        }
                                
                        if (null == res_msg) 
                        {
-                               res_msg = (IMethodReturnMessage)rp.Invoke (msg);
-\r
-                               // Note, from begining this code used AsyncResult.IsCompleted for\r
-                               // checking if it was a remoting or custom proxy, but in some\r
-                               // cases the remoting proxy finish before the call returns\r
-                               // causing this method to be called, therefore causing all kind of bugs.\r
-                               if ((!is_remproxy) && call_type == CallType.BeginInvoke)\r
-                               {\r
+                               bool failed = false;
+                               
+                               try {
+                                       res_msg = (IMethodReturnMessage)rp.Invoke (msg);
+                               } catch (Exception ex) {
+                                       failed = true;
+                                       if (call_type == CallType.BeginInvoke) {
+                                               // If async dispatch crashes, don't propagate the exception.
+                                               // The exception will be raised when calling EndInvoke.
+                                               mMsg.AsyncResult.SyncProcessMessage (new ReturnMessage (ex, msg as IMethodCallMessage));
+                                               res_msg = new ReturnMessage (null, null, 0, null, msg as IMethodCallMessage);
+                                       } else
+                                               throw;
+                               }
+                               
+                               // Note, from begining this code used AsyncResult.IsCompleted for
+                               // checking if it was a remoting or custom proxy, but in some
+                               // cases the remoting proxy finish before the call returns
+                               // causing this method to be called, therefore causing all kind of bugs.
+                               if ((!is_remproxy) && call_type == CallType.BeginInvoke && !failed)
+                               {
                                        IMessage asyncMsg = null;
 
                                        // allow calltype EndInvoke to finish
                                        asyncMsg = mMsg.AsyncResult.SyncProcessMessage (res_msg as IMessage);
+                                       out_args = res_msg.OutArgs;
                                        res_msg = new ReturnMessage (asyncMsg, null, 0, null, res_msg as IMethodCallMessage);
-                               }\r
+                               }
                        }
                        
                        if (res_msg.LogicalCallContext != null && res_msg.LogicalCallContext.HasInfo)
-                               CallContext.UpdateCurrentCallContext (res_msg.LogicalCallContext);
+                               CallContext.UpdateCurrentLogicalCallContext (res_msg.LogicalCallContext);
 
                        exc = res_msg.Exception;
 
@@ -210,8 +227,12 @@ namespace System.Runtime.Remoting.Proxies
                                out_args = null;
                                throw exc.FixRemotingException();
                        }
-                       else if (res_msg is IConstructionReturnMessage || mMsg.CallType == CallType.BeginInvoke) {
-                               out_args = res_msg.OutArgs;
+                       else if (res_msg is IConstructionReturnMessage) {
+                               if (out_args == null)
+                                       out_args = res_msg.OutArgs;
+                       }
+                       else if (mMsg.CallType == CallType.BeginInvoke) {
+                               // We don't have OutArgs in this case.
                        }
                        else if (mMsg.CallType == CallType.Sync) {
                                out_args = ProcessResponse (res_msg, mMsg);
@@ -220,7 +241,8 @@ namespace System.Runtime.Remoting.Proxies
                                out_args = ProcessResponse (res_msg, mMsg.AsyncResult.CallMessage);
                        }
                        else {
-                               out_args = res_msg.OutArgs;
+                               if (out_args == null)
+                                       out_args = res_msg.OutArgs;
                        }
 
                        return res_msg.ReturnValue;
@@ -250,9 +272,7 @@ namespace System.Runtime.Remoting.Proxies
                }
 
                [MonoTODO]
-#if NET_2_0
                [ComVisible (true)]
-#endif
                public IConstructionReturnMessage InitializeServerObject(IConstructionCallMessage ctorMsg)
                {
                        throw new NotImplementedException();