Make -processAttachmentsForRevision ignore the return value of -mutat…

…eAttachments Per code review, Make -processAttachmentsForRevision ignore the return value of -mutateAttachments.
couchbase · Apr 24, 2015 · d7047ed · d7047ed
1 parent 2b214e4
commit d7047ed
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/Source/CBLDatabase+Attachments.m b/Source/CBLDatabase+Attachments.m
@@ -279,7 +279,7 @@ - (BOOL) processAttachmentsForRevision: (CBL_MutableRevision*)rev
     unsigned generation = [CBL_Revision generationFromRevID: prevRevID] + 1;
     __block NSDictionary* parentAttachments = nil;
 
-    return [rev mutateAttachments: ^NSDictionary *(NSString *name, NSDictionary *attachInfo) {
+    [rev mutateAttachments: ^NSDictionary *(NSString *name, NSDictionary *attachInfo) {
         CBL_Attachment* attachment = [[CBL_Attachment alloc] initWithName: name
                                                                      info: attachInfo
                                                                    status: outStatus];
@@ -338,6 +338,8 @@ - (BOOL) processAttachmentsForRevision: (CBL_MutableRevision*)rev
         Assert(attachment.isValid);
         return attachment.asStubDictionary;
     }];
+
+    return !CBLStatusIsError(*outStatus);
 }
 
 

diff --git a/Source/CBLDatabase+Insertion.m b/Source/CBLDatabase+Insertion.m
@@ -228,7 +228,7 @@ - (CBLStatus) forceInsert: (CBL_Revision*)inRev
         NSString* prevRevID = history.count >= 2 ? history[1] : nil;
         if (![self processAttachmentsForRevision: updatedRev
                                        prevRevID: prevRevID
-                                          status: &status] && CBLStatusIsError(status))
+                                          status: &status])
             return status;
         inRev = updatedRev;
     }