Shorter ExecutionContext.Capture (dotnet/coreclr#21707)

Signed-off-by: dotnet-bot <dotnet-bot@microsoft.com>
dotnet · Dec 30, 2018 · 289f0dc · 289f0dc
1 parent dfb9267
commit 289f0dc
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/src/System.Private.CoreLib/shared/System/Threading/ExecutionContext.cs b/src/System.Private.CoreLib/shared/System/Threading/ExecutionContext.cs
@@ -57,10 +57,16 @@ public void GetObjectData(SerializationInfo info, StreamingContext context)
         public static ExecutionContext Capture()
         {
             ExecutionContext executionContext = Thread.CurrentThread.ExecutionContext;
-            return
-                executionContext == null ? Default :
-                executionContext.m_isFlowSuppressed ? null :
-                executionContext;
+            if (executionContext == null)
+            {
+                executionContext = Default;
+            }
+            else if (executionContext.m_isFlowSuppressed)
+            {
+                executionContext = null;
+            }
+
+            return executionContext;
         }
 
         private ExecutionContext ShallowClone(bool isFlowSuppressed)