mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 4.2.0.179

Browse Source 
Former-commit-id: 0a113cb3a6feb7873f632839b1307cc6033cd595
This commit is contained in:
Xamarin Public Jenkins
2015-08-26 07:17:56 -04:00
committed by Jo Shields
parent 183bba2c9a
commit 6992685b86
7507 changed files with 90259 additions and 657307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mcs/class/corlib/System.Runtime.Remoting.Proxies/RealProxy.cs
View File

@@ -163,7 +163,7 @@ namespace System.Runtime.Remoting.Proxies
out object [] out_args)
{
MonoMethodMessage mMsg = (MonoMethodMessage) msg;
mMsg.LogicalCallContext = ExecutionContext.CreateLogicalCallContext (true);
mMsg.LogicalCallContext = Thread.CurrentThread.GetMutableExecutionContext().LogicalCallContext;
CallType call_type = mMsg.CallType;
bool is_remproxy = (rp is RemotingProxy);
@@ -218,8 +218,9 @@ namespace System.Runtime.Remoting.Proxies
}
}
if (res_msg.LogicalCallContext != null && res_msg.LogicalCallContext.HasInfo)
CallContext.UpdateCurrentLogicalCallContext (res_msg.LogicalCallContext);
if (res_msg.LogicalCallContext != null && res_msg.LogicalCallContext.HasInfo) {
Thread.CurrentThread.GetMutableExecutionContext().LogicalCallContext.Merge (res_msg.LogicalCallContext);
}
exc = res_msg.Exception;