Fixed assertion failure pushing a rev that's already compacted/pruned

Fixes #1217
couchbase · May 4, 2016 · 2864e0b · 2864e0b
1 parent a0975fc
commit 2864e0b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/Source/CBLRestPusher.m b/Source/CBLRestPusher.m
@@ -282,14 +282,19 @@ - (void) uploadChanges: (CBL_RevisionList*)changes
                 CBLStatus status;
                 CBL_Revision* loadedRev = [db revisionByLoadingBody: rev
                                                              status: &status];
-                if (loadedRev && !loadedRev.properties)
+                if (loadedRev && !loadedRev.properties) {
+                    loadedRev = nil;
                     status = kCBLStatusBadJSON;
-                if (status >= 300) {
-                    Warn(@"%@: Couldn't get local contents of %@ (status=%d)", self, rev, status);
+                }
+                if (!loadedRev) {
+                    if (status != kCBLStatusNotFound)
+                        Warn(@"%@: Couldn't get local contents of %@ (status=%d)",
+                             self, rev, status);
                     if (status < 500)
                         [self removePending: rev];
                     else
                         [self revisionFailed]; // db error, may be temporary
+                    continue;
                 }
 
                 if ($castIf(NSNumber, loadedRev[@"_removed"]).boolValue) {

diff --git a/Source/CBL_SQLiteStorage.m b/Source/CBL_SQLiteStorage.m
@@ -719,8 +719,6 @@ - (CBL_MutableRevision*) getDocumentWithID: (NSString*)docID
 
 
 - (CBLStatus) loadRevisionBody: (CBL_MutableRevision*)rev {
-    if (rev.body && rev.sequenceIfKnown)
-        return kCBLStatusOK;  // no-op
     Assert(rev.docID && rev.revID);
     SInt64 docNumericID = [self getDocNumericID: rev.docID];
     if (docNumericID <= 0)