Fixed selectConflictRevision() (#1658)

Author: Hideki Itakura

shared/src/main/java/com/couchbase/lite/AbstractDatabase.java

@@ -738,7 +738,10 @@ void resolveConflictInDocument(String docID) throws CouchbaseLiteException {
                 // Read the conflicting remote revision:
                 Document remoteDoc = new Document((Database) this, docID, true);
                 try {
-                    remoteDoc.selectConflictingRevision();
+                    if(!remoteDoc.selectConflictingRevision()){
+                        Log.w(TAG, "Unable to select conflicting revision for '%s', skipping...",docID);
+                        return;
+                    }
                 } catch (LiteCoreException e) {
                     throw CBLStatus.convertException(e);
                 }

shared/src/main/java/com/couchbase/lite/Document.java

@@ -494,7 +494,7 @@ C4Document getC4doc() {
         }
     }
 
-    void selectConflictingRevision() throws LiteCoreException {
+    boolean selectConflictingRevision() throws LiteCoreException {
         synchronized (lock) {
             boolean foundConflict = false;
             if (_c4doc != null) {
@@ -513,6 +513,7 @@ void selectConflictingRevision() throws LiteCoreException {
             }
             if (foundConflict)
                 setC4Document(_c4doc);
+            return foundConflict;
         }
     }