Merge pull request #2289 from justinvp/ioiterator

stephentoub · stephentoub · commit d9f76a83d72a · 2015-07-09T13:43:52.000-04:00
Check the state before fetching the thread id
diff --git a/src/System.IO.FileSystem/src/System/IO/Iterator.cs b/src/System.IO.FileSystem/src/System/IO/Iterator.cs
@@ -41,7 +41,7 @@ protected virtual void Dispose(bool disposing)
 
         public IEnumerator<TSource> GetEnumerator()
         {
-            if (_threadId == Environment.CurrentManagedThreadId && state == 0)
+            if (state == 0 && _threadId == Environment.CurrentManagedThreadId)
             {
                 state = 1;
                 return this;

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ protected virtual void Dispose(bool disposing)`
`41`	`41`
`42`	`42`	`public IEnumerator<TSource> GetEnumerator()`
`43`	`43`	`{`
`44`		`- if (_threadId == Environment.CurrentManagedThreadId && state == 0)`
	`44`	`+ if (state == 0 && _threadId == Environment.CurrentManagedThreadId)`
`45`	`45`	`{`
`46`	`46`	`state = 1;`
`47`	`47`	`return this;`