Skip to content

Fix for NSOperationQueue race condition causing public CI failures #642

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 15, 2016
Merged

Fix for NSOperationQueue race condition causing public CI failures #642

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions Foundation/NSOperation.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,11 +399,13 @@ open class OperationQueue: NSObject {
execution. The only differential is that the block enqueued to dispatch_async
is balanced with the number of Operations enqueued to the NSOperationQueue.
*/
lock.lock()
ops.forEach { (operation: Operation) -> Void in
lock.lock()
operation._queue = self
_operations.insert(operation)
lock.unlock()
}
lock.unlock()
ops.forEach { (operation: Operation) -> Void in
#if DEPLOYMENT_ENABLE_LIBDISPATCH
if let group = waitGroup {
group.enter()
Expand Down