Merge branch 'master' of https://github.com/ashihaby/couchbase-lite-java-core into ashihaby-master

Author: hideki

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

@@ -904,10 +904,8 @@ public Map<String, Object> invoke(Map<String, Object> attachment) {
 
                 int revPos = (Integer) attachment.get("revpos");
                 if (revPos < minRevPos && revPos != 0) {
-                    Map<String, Object> map = new HashMap<String, Object>();
-                    map.put("stub", true);
-                    map.put("revpos", revPos);
-                    return map;
+                    //nothing changed
+                    return attachment;
                 } else {
                     Map<String, Object> expanded = new HashMap<String, Object>();
                     expanded.putAll(attachment);

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

@@ -590,12 +590,12 @@ private boolean uploadMultipartRevision(final RevisionInternal revision) {
         Map<String, Object> body = revision.getProperties();
         Map<String, Object> attachments = (Map<String, Object>) body.get("_attachments");
 
+        boolean attachmentsFollow = false;
         for (String attachmentKey : attachments.keySet()) {
             Map<String, Object> attachment = (Map<String, Object>) attachments.get(attachmentKey);
-            if (!attachment.containsKey("follows")) {
-                return false;
-            }
+            if (attachment.containsKey("follows")) attachmentsFollow = true;
         }
+        if (!attachmentsFollow) return false;
 
         Log.d(TAG, "Uploading multipart request.  Revision: %s", revision);
         addToChangesCount(1);