Optimize common path

mono · Aug 19, 2013 · 1fe2472 · 1fe2472
1 parent 88dadaa
commit 1fe2472
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/mcs/class/corlib/System.Threading/CancellationToken.cs b/mcs/class/corlib/System.Threading/CancellationToken.cs
@@ -85,7 +85,7 @@ public CancellationTokenRegistration Register (Action<object> callback, object s
 
 		public void ThrowIfCancellationRequested ()
 		{
-			if (Source.IsCancellationRequested)
+			if (source != null && source.IsCancellationRequested)
 				throw new OperationCanceledException (this);
 		}
 

diff --git a/mcs/class/corlib/System.Threading/ManualResetEventSlim.cs b/mcs/class/corlib/System.Threading/ManualResetEventSlim.cs
@@ -164,8 +164,6 @@ public bool Wait (int millisecondsTimeout, CancellationToken cancellationToken)
 				SpinWait wait = new SpinWait ();
 
 				while (!IsSet) {
-					cancellationToken.ThrowIfCancellationRequested ();
-
 					if (wait.Count < spinCount) {
 						wait.SpinOnce ();
 						continue;
@@ -174,6 +172,8 @@ public bool Wait (int millisecondsTimeout, CancellationToken cancellationToken)
 					break;
 				}
 
+				cancellationToken.ThrowIfCancellationRequested ();
+
 				if (IsSet)
 					return true;