修复 遍历Array 的线程安全问题

Author: [email protected]

LKDBHelper.podspec.json

@@ -1,6 +1,6 @@
 {
   "name": "LKDBHelper",
-  "version": "2.4.7",
+  "version": "2.5.1",
   "summary": "全自动的插入,查询,更新,删除， an automatic database operation thread-safe and not afraid of recursive deadlock",
   "description": "全面支持 NSArray,NSDictionary, ModelClass, NSNumber, NSString, NSDate, NSData, UIColor, UIImage, CGRect, CGPoint, CGSize, NSRange, int,char,float, double, long.. 等属性的自动化操作(插入和查询)",
   "homepage": "https://github.com/li6185377/LKDBHelper-SQLite-ORM",
@@ -10,7 +10,7 @@
   },
   "source": {
     "git": "https://github.com/li6185377/LKDBHelper-SQLite-ORM.git",
-    "tag": "2.4.7"
+    "tag": "2.5.1"
   },
   "platforms": {
     "ios": "5.0",

LKDBHelper/Helper/LKDBHelper.m

@@ -78,8 +78,7 @@ + (void)setLogError:(BOOL)logError
 #ifdef DEBUG
     LKDBLogErrorEnable = logError;
     NSMutableArray *dbArray = [self dbHelperSingleArray];
-    @synchronized(dbArray)
-    {
+    @synchronized(dbArray) {
         [dbArray enumerateObjectsUsingBlock:^(LKDBWeakObject *weakObj, NSUInteger idx, BOOL *stop) {
             [weakObj.obj executeDB:^(FMDatabase *db) {
                 db.logsErrors = LKDBLogErrorEnable;
@@ -100,7 +99,7 @@ + (BOOL)nullIsEmpty
 
 + (NSMutableArray *)dbHelperSingleArray
 {
-    static __strong NSMutableArray *dbArray;
+    static NSMutableArray *dbArray;
     static dispatch_once_t onceToken;
     dispatch_once(&onceToken, ^{
         dbArray = [NSMutableArray array];
@@ -110,32 +109,33 @@ + (NSMutableArray *)dbHelperSingleArray
 
 + (LKDBHelper *)dbHelperWithPath:(NSString *)dbFilePath save:(LKDBHelper *)helper
 {
-    NSMutableArray *dbArray = [self dbHelperSingleArray];
     LKDBHelper *instance = nil;
     dbFilePath = dbFilePath.lowercaseString;
 
     NSMutableIndexSet *indexSet = [NSMutableIndexSet indexSet];
     BOOL hasCached = NO;
 
-    for (NSInteger i = 0; i < dbArray.count; i++) {
-        LKDBWeakObject *weakObj = [dbArray objectAtIndex:i];
-        if ([weakObj.obj.dbPath.lowercaseString isEqualToString:dbFilePath]) {
-            if (helper) {
-                hasCached = YES;
-            } else {
-                instance = weakObj.obj;
+    NSMutableArray *dbArray = [self dbHelperSingleArray];
+    @synchronized(dbArray) {
+        for (NSInteger i = 0; i < dbArray.count; i++) {
+            LKDBWeakObject *weakObj = [dbArray objectAtIndex:i];
+            if ([weakObj.obj.dbPath.lowercaseString isEqualToString:dbFilePath]) {
+                if (helper) {
+                    hasCached = YES;
+                } else {
+                    instance = weakObj.obj;
+                }
+            } else if (!weakObj.obj){
+                [indexSet addIndex:i];
             }
-        } else if (!weakObj.obj){
-            [indexSet addIndex:i];
         }
-    }
-    
-    [dbArray removeObjectsAtIndexes:indexSet];
-    
-    if (!hasCached && helper) {
-        LKDBWeakObject *weakObj = [[LKDBWeakObject alloc] init];
-        weakObj.obj = helper;
-        [dbArray addObject:weakObj];
+        [dbArray removeObjectsAtIndexes:indexSet];
+        
+        if (!hasCached && helper) {
+            LKDBWeakObject *weakObj = [[LKDBWeakObject alloc] init];
+            weakObj.obj = helper;
+            [dbArray addObject:weakObj];
+        }
     }
 
     return instance;
@@ -525,16 +525,19 @@ - (NSString *)encryptionKey
 #pragma mark - dealloc
 - (void)dealloc
 {
-    NSArray *array = [LKDBHelper dbHelperSingleArray];
-    @synchronized(array)
-    {
-        for (LKDBWeakObject *weakObject in array) {
-            if ([weakObject.obj isEqual:self]) {
-                weakObject.obj = nil;
+    NSMutableArray *dbArray = [LKDBHelper dbHelperSingleArray];
+    @synchronized(dbArray) {
+        NSMutableIndexSet *indexSet = [NSMutableIndexSet indexSet];
+        for (NSInteger i = 0; i < dbArray.count; i++) {
+            LKDBWeakObject *weakObj = [dbArray objectAtIndex:i];
+            if (weakObj.obj == self){
+                weakObj.obj = nil;
+                [indexSet addIndex:i];
             }
         }
+        [dbArray removeObjectsAtIndexes:indexSet];
     }
-
+    
     [self.bindingQueue close];
     self.usingdb = nil;
     self.bindingQueue = nil;