[FIX] distribution problem

novastone-media · Mar 2, 2016 · ac631e8 · ac631e8
1 parent 049692e
commit ac631e8
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 24 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,7 @@
 MQTT-Client-Framework iOS/OSX/tvOS Release Notes
 ================================================
 
-## MQTT-Client-Framework 0.7.0
+## MQTT-Client-Framework 0.7.0/1
 > Release date 2016-03-02
 
 [FIX] Persistent store not saved to disk closes #117

diff --git a/MQTTClient.podspec b/MQTTClient.podspec
@@ -1,13 +1,13 @@
 Pod::Spec.new do |mqttc|
  mqttc.name = "MQTTClient"
- mqttc.version = "0.7.0"
+ mqttc.version = "0.7.1"
  mqttc.summary = "iOS, OSX and tvOS native ObjectiveC MQTT Client Framework"
  mqttc.homepage = "https://github.com/ckrey/MQTT-Client-Framework"
  mqttc.license = { :type => "EPLv1", :file => "LICENSE" }
  mqttc.author = { "Christoph Krey" => "[email protected]" }
  mqttc.source = {
  :git => "https://github.com/ckrey/MQTT-Client-Framework.git",
- :tag => "0.7.0",
+ :tag => "0.7.1",
  :submodules => true
  }
 

diff --git a/MQTTClient/MQTTClient/MQTTCoreDataPersistence.m b/MQTTClient/MQTTClient/MQTTCoreDataPersistence.m
@@ -169,24 +169,22 @@ - (void)recursiveSave;
 @implementation NSManagedObjectContext ( Recursive )
 
 - (void)recursiveSave {
- [self performBlockAndWait:^{
- if (self.hasChanges) {
- DDLogVerbose(@"[MQTTPersistence] pre-sync: i%lu u%lu d%lu",
- (unsigned long)self.insertedObjects.count,
- (unsigned long)self.updatedObjects.count,
- (unsigned long)self.deletedObjects.count
- );
-
- NSError *error = nil;
- if (![self save: &error]) {
- DDLogError(@"[MQTTPersistence] sync error %@", error);
- }
-
- if( nil != self.parentContext ){
- [self.parentContext recursiveSave];
- }
+ if (self.hasChanges) {
+ DDLogVerbose(@"[MQTTPersistence] pre-sync: i%lu u%lu d%lu",
+ (unsigned long)self.insertedObjects.count,
+ (unsigned long)self.updatedObjects.count,
+ (unsigned long)self.deletedObjects.count
+ );
+
+ NSError *error = nil;
+ if (![self save: &error]) {
+ DDLogError(@"[MQTTPersistence] sync error %@", error);
  }
- }];
+
+ if( nil != self.parentContext ){
+ [self.parentContext recursiveSave];
+ }
+ }
 }
 @end
 
@@ -249,7 +247,7 @@ - (MQTTCoreDataFlow *)storeMessageForClientId:(NSString *)clientId
 - (void)deleteFlow:(MQTTCoreDataFlow *)flow {
  [self.managedObjectContext performBlockAndWait:^{
  [self.managedObjectContext deleteObject:(NSManagedObject *)flow.object];
- [self sync];
+ [self syncInternal];
  }];
 }
 
@@ -261,17 +259,21 @@ - (void)deleteAllFlowsForClientId:(NSString *)clientId {
  for (MQTTCoreDataFlow *flow in [self allFlowsforClientId:clientId incomingFlag:FALSE]) {
  [self.managedObjectContext deleteObject:(NSManagedObject *)flow.object];
  }
- [self sync];
+ [self syncInternal];
  }];
 }
 
 - (void)sync {
- [self.managedObjectContext recursiveSave];
  [self.managedObjectContext performBlockAndWait:^{
- [self sizes];
+ [self syncInternal];
  }];
 }
 
+- (void)syncInternal {
+ [self.managedObjectContext recursiveSave];
+ [self sizes];
+}
+
 - (NSArray *)allFlowsforClientId:(NSString *)clientId
  incomingFlag:(BOOL)incomingFlag {
  NSMutableArray *flows = [NSMutableArray array];