Merge pull request #1357 from couchbase/feature/issue_1356

Fixed #1356 - default response body`{"ok":"true"}` is not returned.

Author: pasin

src/main/java/com/couchbase/lite/router/Router.java

@@ -115,6 +115,7 @@ private enum TDContentOptions {
     private boolean waiting = false;
     private URL source = null;
     private Timer timer = null; // timer for heartbeat
+    private boolean dontOverwriteBody = false;
 
     private final Object databaseChangesLongpollLock = new Object();
 
@@ -633,8 +634,8 @@ public void start() {
 
             if (status.isSuccessful() &&
                 connection.getResponseBody() == null &&
-                connection.getResponseInputStream() == null &&
-                connection.getHeaderField("Content-Type") == null) {
+                connection.getHeaderField("Content-Type") == null &&
+                dontOverwriteBody == false) {
                 connection.setResponseBody(new Body("{\"ok\":true}".getBytes()));
             }
 
@@ -2052,6 +2053,7 @@ public Status do_GET_Attachment(Database _db, String docID, String _attachmentNa
                 connection.getResHeader().add("Content-Encoding", "gzip");
             }
 
+            dontOverwriteBody = true;
             connection.setResponseInputStream(attachment.getContentInputStream());
             return new Status(Status.OK);