Reverse the polarity

benaadams · benaadams · commit 672e93aa5eda · 2016-02-13T19:30:30.000Z
diff --git a/src/mscorlib/src/System/Threading/ThreadPool.cs b/src/mscorlib/src/System/Threading/ThreadPool.cs
@@ -1208,17 +1208,17 @@ void IThreadPoolWorkItem.ExecuteWorkItem()
 #if DEBUG
             MarkExecuted(false);
 #endif
-            if (context != null)
-            {
-                ExecutionContext.Run(context, ccb, this, true);
-            }
-            else
+            // call directly if it is an unsafe call OR EC flow is suppressed
+            if (context == null)
             {
-                // call directly if it is an unsafe call OR EC flow is suppressed
                 WaitCallback cb = callback;
                 callback = null;
                 cb(state);
             }
+            else
+            {
+                ExecutionContext.Run(context, ccb, this, true);
+            }
         }
 
         [SecurityCritical]
@@ -1679,19 +1679,10 @@ private static bool QueueUserWorkItemHelper(WaitCallback callBack, Object state,
                         ExecutionContext.Capture(ref stackMark, ExecutionContext.CaptureOptions.IgnoreSyncCtx | ExecutionContext.CaptureOptions.OptimizeDefaultCase) :
                         null;
 
-                    IThreadPoolWorkItem tpcallBack;
-                    if (context == null)
-                    {
-                        tpcallBack = new QueueUserWorkItemCallback(callBack, state, null); // null context
-                    }
-                    else if (context.IsDefaultFTContext(true))
-                    {
-                        tpcallBack = new QueueUserWorkItemCallbackDefaultContext(callBack, state); // default context
-                    }
-                    else
-                    {
-                        tpcallBack = new QueueUserWorkItemCallback(callBack, state, context); // non-default context
-                    }
+                    IThreadPoolWorkItem tpcallBack = context == ExecutionContext.PreAllocatedDefault ?
+                                 new QueueUserWorkItemCallbackDefaultContext(callBack, state) :
+                                 (IThreadPoolWorkItem)new QueueUserWorkItemCallback(callBack, state, context);
+
                     ThreadPoolGlobals.workQueue.Enqueue(tpcallBack, true);
                     success = true;
                 }
