Merge pull request #1331 from couchbase/feature/issue_and_933

Fixed https://github.com/couchbase/couchbase-lite-android/issues/933

Author: pasin

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

@@ -1474,9 +1474,8 @@ public Map<String, Object> getRevisionHistoryDictStartingFromAnyAncestor(Revisio
                                                                              List<String> ancestorRevIDs) {
         List<RevisionInternal> history = getRevisionHistory(rev);
         // (this is in reverse order, newest..oldest
-        if (ancestorRevIDs != null && ancestorRevIDs.size() > 0) {
-            int n = history.size();
-            for (int i = 0; i < n; ++i) {
+        if (ancestorRevIDs != null && ancestorRevIDs.size() > 0 && history != null) {
+            for (int i = 0; i < history.size(); ++i) {
                 if (ancestorRevIDs.contains(history.get(i).getRevID())) {
                     history = history.subList(0, i + 1);
                     break;

src/main/java/com/couchbase/lite/store/SQLiteStore.java

@@ -896,7 +896,6 @@ public List<RevisionInternal> getRevisionHistory(RevisionInternal rev) {
         List<RevisionInternal> result;
         try {
             cursor = storageEngine.rawQuery(sql, args);
-
             cursor.moveToNext();
             long lastSequence = 0;
             result = new ArrayList<RevisionInternal>();