2009-07-30 Gonzalo Paniagua Javier <gonzalo@novell.com>

[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 84c7df7e88e2d32ee28b97c3df410d96c3b19950..39823ffd07e56e87bd12f27685d86c70629d2cb8 100644 (file)
--- a/mcs/class/corlib/System.Runtime.Remoting.Proxies/RealProxy.cs
+++ b/mcs/class/corlib/System.Runtime.Remoting.Proxies/RealProxy.cs
@@ -41,28 +41,41 @@ 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
        internal class TransparentProxy {
                public RealProxy _rp;
                IntPtr _class;
                bool _custom_type_info;
        }
+#pragma warning restore 169, 649
        
+#if NET_2_0
+       [ComVisible (true)]
+#endif
        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;
                MarshalByRefObject _server;
                int _targetDomainId = -1;
                internal string _targetUri;
-               #endregion
-               
                internal Identity _objectIdentity;
                Object _objTP;
                object _stubData;
+        #endregion
+#pragma warning restore 169, 414
 
                protected RealProxy ()
                {
@@ -107,8 +120,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
@@ -154,11 +167,11 @@ namespace System.Runtime.Remoting.Proxies
                        MonoMethodMessage mMsg = (MonoMethodMessage) msg;
                        mMsg.LogicalCallContext = CallContext.CreateLogicalCallContext (true);
                        CallType call_type = mMsg.CallType;
-                       bool is_remproxy = (rp as RemotingProxy) != null;
+                       bool is_remproxy = (rp is RemotingProxy);
 
                        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;
 
@@ -166,30 +179,43 @@ 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);
                                        res_msg = new ReturnMessage (asyncMsg, null, 0, null, res_msg as IMethodCallMessage);
-                               }\r
+                               }
                        }
                        
                        if (res_msg.LogicalCallContext != null && res_msg.LogicalCallContext.HasInfo)
@@ -242,6 +268,9 @@ namespace System.Runtime.Remoting.Proxies
                }
 
                [MonoTODO]
+#if NET_2_0
+               [ComVisible (true)]
+#endif
                public IConstructionReturnMessage InitializeServerObject(IConstructionCallMessage ctorMsg)
                {
                        throw new NotImplementedException();