---

schmidt-sebastian · schmidt-sebastian · commit 1ef020b65a49 · 2018-09-28T13:45:19.000-07:00
yaml --- r: 10185 b: refs/heads/mrschmidt-nosnapshot c: 94df9c0 h: refs/heads/master i: 10183: f6fd8a3
diff --git a/[refs] b/[refs]
@@ -129,4 +129,4 @@ refs/heads/elharo-patch-4: 83538c7aa8a40cba7dd996ade653072cc67b3b65
 refs/heads/grpc: da780702593d72aa71d0223b3fa11add95062a0b
 refs/heads/mrschmidt-arrayuniontests: 98e5ed4411344fa5e3735e59b1d6a4da7333f241
 refs/heads/mrschmidt-list: a65b2421eaa3fbb59565fcd978df62ca6b6f1ec3
-refs/heads/mrschmidt-nosnapshot: e8cff3f90645c38723d08a8fecfacb8635fe64ea
+refs/heads/mrschmidt-nosnapshot: 94df9c0a286591a5b58a207e99f4d9cf030c7317
diff --git a/branches/mrschmidt-nosnapshot/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/Watch.java b/branches/mrschmidt-nosnapshot/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/Watch.java
@@ -406,7 +406,6 @@ public void run() {
               Preconditions.checkState(stream == null);
 
               current = false;
-              hasPushed = false;
               nextAttempt = backoff.createNextAttempt(nextAttempt);
 
               stream = firestore.streamRequest(Watch.this, firestore.getClient().listenCallable());
diff --git a/branches/mrschmidt-nosnapshot/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/WatchTest.java b/branches/mrschmidt-nosnapshot/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/WatchTest.java
@@ -304,6 +304,35 @@ public void queryWatchReopensOnUnexceptedStreamEnd() throws InterruptedException
     awaitQuerySnapshot(new SnapshotDocument(ChangeType.ADDED, "coll/doc", SINGLE_FIELD_MAP));
   }
 
+  @Test
+  public void queryWatchDoesntSendRaiseSnapshotOnReset() throws InterruptedException {
+    // This test is meant to reproduce https://github.com/googleapis/google-cloud-dotnet/issues/2542
+    addQueryListener();
+
+    awaitAddTarget();
+
+    send(addTarget());
+    send(current());
+    send(snapshot());
+
+    awaitQuerySnapshot();
+
+    close();
+    awaitClose();
+    awaitAddTarget();
+
+    send(addTarget());
+    send(current());
+    // This should not raise a snapshot, since nothing has changed since the last snapshot.
+    send(snapshot());
+
+    send(doc("coll/doc", SINGLE_FIELD_PROTO));
+    send(snapshot());
+
+    // Verify that we only receveived one snapshot.
+    awaitQuerySnapshot(new SnapshotDocument(ChangeType.ADDED, "coll/doc", SINGLE_FIELD_MAP));
+  }
+
   @Test
   public void queryWatchDoesntReopenInactiveStream() throws InterruptedException {
     addQueryListener();
