Merge branch 'develop' into corestore2_develop

Conflicts:
	CoreStore.podspec
	CoreStore/Info.plist
This commit is contained in:
John Rommel Estropia
2016-02-26 01:51:35 +09:00
4 changed files with 60 additions and 6 deletions

View File

@@ -39,8 +39,10 @@ public final class SynchronousDataTransaction: BaseDataTransaction {
/**
Saves the transaction changes and waits for completion synchronously. This method should not be used after the `commit()` method was already called once.
- returns: a `SaveResult` containing the success or failure information
*/
public func commit() {
public func commitAndWait() -> SaveResult {
CoreStore.assert(
self.transactionQueue.isCurrentExecutionContext(),
@@ -52,7 +54,10 @@ public final class SynchronousDataTransaction: BaseDataTransaction {
)
self.isCommitted = true
self.result = self.context.saveSynchronously()
let result = self.context.saveSynchronously()
self.result = result
return result
}
/**
@@ -197,6 +202,12 @@ public final class SynchronousDataTransaction: BaseDataTransaction {
self.context.reset()
}
@available(*, deprecated=1.5.2, renamed="commitAndWait")
public func commit() {
self.commitAndWait()
}
// MARK: Internal