+ MonoMethodMessage mMsg = (MonoMethodMessage) msg;
+ mMsg.LogicalCallContext = CallContext.CreateLogicalCallContext (true);
+ CallType call_type = mMsg.CallType;
+ bool is_remproxy = (rp is RemotingProxy);
+
+ IMethodReturnMessage res_msg = null;
+
+ if (call_type == CallType.BeginInvoke)
+ // todo: set CallMessage in runtime instead
+ mMsg.AsyncResult.CallMessage = mMsg;
+
+ if (call_type == CallType.EndInvoke)
+ res_msg = (IMethodReturnMessage)mMsg.AsyncResult.EndInvoke ();
+
+ // Check for constructor msg
+ if (mMsg.MethodBase.IsConstructor)
+ {
+ if (is_remproxy)
+ res_msg = (IMethodReturnMessage) (rp as RemotingProxy).ActivateRemoteObject ((IMethodMessage) msg);
+ else
+ msg = new ConstructionCall (rp.GetProxiedType ());
+ }
+
+ if (null == res_msg)
+ {
+ 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);
+ }
+ }
+
+ if (res_msg.LogicalCallContext != null && res_msg.LogicalCallContext.HasInfo)
+ CallContext.UpdateCurrentCallContext (res_msg.LogicalCallContext);