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

Imported Upstream version 5.4.0.167

Browse Source 
Former-commit-id: 5624ac747d633e885131e8349322922b6a59baaa
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-08-21 15:34:15 +00:00
parent e49d6f06c0
commit 536cd135cc
12856 changed files with 563812 additions and 223249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
mcs/class/referencesource/System.ServiceModel/System/ServiceModel/OperationContext.cs
View File

@ -100,7 +100,7 @@ namespace System.ServiceModel
set
{
if (ShouldUseAsyncLocalContext)
if (ShouldUseAsyncLocalContext && value != null && value.isAsyncFlowEnabled)
{
OperationContext.currentAsyncLocalContext.Value = value;
}
@ -125,11 +125,11 @@ namespace System.ServiceModel
}
}
private static bool ShouldUseAsyncLocalContext
internal static bool ShouldUseAsyncLocalContext
{
get
{
return CurrentHolder.Context == null && OperationContext.currentAsyncLocalContext.Value != null && OperationContext.currentAsyncLocalContext.Value.isAsyncFlowEnabled;
return !ServiceModelAppSettings.DisableOperationContextAsyncFlow && CurrentHolder.Context == null && OperationContext.currentAsyncLocalContext.Value != null && OperationContext.currentAsyncLocalContext.Value.isAsyncFlowEnabled;
}
}
@ -359,8 +359,16 @@ namespace System.ServiceModel
internal static void EnableAsyncFlow()
{
CurrentHolder.Context.isAsyncFlowEnabled = true;
currentAsyncLocalContext.Value = CurrentHolder.Context;
EnableAsyncFlow(CurrentHolder.Context);
}
internal static void EnableAsyncFlow(OperationContext oc)
{
if (oc != null)
{
oc.isAsyncFlowEnabled = true;
currentAsyncLocalContext.Value = oc;
}
}
internal static void DisableAsyncFlow()