starred/CoreStore
1
0
Fork 0
mirror of https://github.com/JohnEstropia/CoreStore.git synced 2026-03-30 14:21:49 +02:00
Code Issues 95 Packages Projects Releases 10 Wiki Activity

Merge branch 'master' into corestore2_develop

Browse Source 
# Conflicts:
#	CoreStore.podspec
#	Sources/Info.plist
#	Sources/Internal/NSManagedObjectContext+Transaction.swift
This commit is contained in:
John Rommel Estropia
2016-05-07 17:47:35 +08:00
parent ae5f737baf c990f7764a
commit a6291e116c
5 changed files with 51 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Sources/Internal/NSManagedObjectContext+Setup.swift
View File

@@ -100,14 +100,28 @@ internal extension NSManagedObjectContext {
object: rootContext,
closure: { [weak context] (note) -> Void in
context?.performBlock { () -> Void in
guard let rootContext = note.object as? NSManagedObjectContext,
let context = context else {
return
}
let mergeChanges = { () -> Void in
let updatedObjects = (note.userInfo?[NSUpdatedObjectsKey] as? Set<NSManagedObject>) ?? []
for object in updatedObjects {
context?.objectWithID(object.objectID).willAccessValueForKey(nil)
context.objectWithID(object.objectID).willAccessValueForKey(nil)
}
context?.mergeChangesFromContextDidSaveNotification(note)
context.mergeChangesFromContextDidSaveNotification(note)
}
if rootContext.isSavingSynchronously == true {
context.performBlockAndWait(mergeChanges)
}
else {
context.performBlock(mergeChanges)
}
}
)