Skip to content

Commit f78d720

Browse files
committed
Fixed #1272 Missing data of attachment while pushing attachments
1 parent 9e9a42d commit f78d720

2 files changed

Lines changed: 5 additions & 7 deletions

File tree

src/main/java/com/couchbase/lite/Database.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -906,10 +906,8 @@ public Map<String, Object> invoke(Map<String, Object> attachment) {
906906

907907
int revPos = (Integer) attachment.get("revpos");
908908
if (revPos < minRevPos && revPos != 0) {
909-
Map<String, Object> map = new HashMap<String, Object>();
910-
map.put("stub", true);
911-
map.put("revpos", revPos);
912-
return map;
909+
//nothing changed
910+
return attachment;
913911
} else {
914912
Map<String, Object> expanded = new HashMap<String, Object>();
915913
expanded.putAll(attachment);

src/main/java/com/couchbase/lite/replicator/PusherInternal.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -526,12 +526,12 @@ private boolean uploadMultipartRevision(final RevisionInternal revision) {
526526
Map<String, Object> body = revision.getProperties();
527527
Map<String, Object> attachments = (Map<String, Object>) body.get("_attachments");
528528

529+
boolean attachmentsFollow = false;
529530
for (String attachmentKey : attachments.keySet()) {
530531
Map<String, Object> attachment = (Map<String, Object>) attachments.get(attachmentKey);
531-
if (!attachment.containsKey("follows")) {
532-
return false;
533-
}
532+
if (attachment.containsKey("follows")) attachmentsFollow = true;
534533
}
534+
if (!attachmentsFollow) return false;
535535

536536
Log.d(Log.TAG_SYNC, "Uploading multipart request. Revision: %s", revision);
537537
addToChangesCount(1);

0 commit comments

Comments
 (0)