starred/CoreStore
1
0
Fork 0
mirror of https://github.com/JohnEstropia/CoreStore.git synced 2026-01-16 22:16:53 +01:00
Code Issues 95 Packages Projects Releases 10 Wiki Activity

Fixes #98 (deadlock when merge happens while main queue is querying)

Browse Source
This commit is contained in:
Colin Morelli
2016-09-29 14:47:51 -04:00
parent ed8c7b35e8
commit 8be20370d5
3 changed files with 33 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Sources/Internal/NSManagedObjectContext+Transaction.swift
View File

@@ -101,8 +101,8 @@ internal extension NSManagedObjectContext {
}
@nonobjc
internal func saveSynchronously() -> SaveResult {
internal func saveSynchronously(mergeSynchronously: Bool = true) -> SaveResult {
var result = SaveResult(hasChanges: false)
self.performBlockAndWait {
@@ -114,7 +114,7 @@ internal extension NSManagedObjectContext {
do {
self.isSavingSynchronously = true
self.isSavingSynchronously = mergeSynchronously
try self.save()
self.isSavingSynchronously = nil
}
@@ -131,7 +131,7 @@ internal extension NSManagedObjectContext {
if let parentContext = self.parentContext where self.shouldCascadeSavesToParent {
switch parentContext.saveSynchronously() {
switch parentContext.saveSynchronously(mergeSynchronously) {
case .Success:
result = SaveResult(hasChanges: true)