Fixed the lost update scenario

If we get a fetchMore right between when the revision was updated and
the incrementalQuery actually running, we ended up loosing the update
because the result provider ended up with a too recent revision after
the additional initial query.

1 files changed, 5 insertions, 1 deletions

diff --git a/common/queryrunner.cpp b/common/queryrunner.cpp
index 0977940..9ac3517 100644
--- a/common/queryrunner.cpp
+++ b/common/queryrunner.cpp
@@ -152,7 +152,11 @@ void QueryRunner<DomainType>::fetch(const Sink::Query &query, const QByteArray &
             if (query.liveQuery()) {
                 mResourceAccess->sendRevisionReplayedCommand(result.newRevision);
             }
-            mResultProvider->setRevision(result.newRevision);
+            //Initial queries do not fetch updates, so avoid updating the revision when fetching more content.
+            //Otherwise we end up breaking incremental updates.
+            if (!mResultProvider->revision()) {
+                mResultProvider->setRevision(result.newRevision);
+            }
             mResultProvider->initialResultSetComplete(result.replayedAll);
             if (mRequestFetchMore) {
                 mRequestFetchMore = false;