---

Ajay Kannan · Ajay Kannan · commit b8f90caffd8b · 2015-10-16T11:06:08.000-07:00
yaml --- r: 7127 b: refs/heads/tswast-patch-1 c: 35ea69a h: refs/heads/master i: 7125: f3212ad 7123: e47e0f0 7119: c0f9547
diff --git a/[refs] b/[refs]
@@ -57,5 +57,5 @@ refs/tags/v0.18.0: 9d193c4c4b9d1c6f21515dd8e50836b9194ec9bb
 refs/tags/v0.19.0: e67b56e4d8dad5f9a7b38c9b2107c23c828f2ed5
 refs/tags/v0.20.0: 839f7fb7156535146aa1cb2c5aadd8d375d854e8
 refs/tags/v0.20.1: 370471f437f1f4f68a11e068df5cd6bf39edb1fa
-refs/heads/tswast-patch-1: 0c2f9e93ffb78aadb55c3abf558e47c616336c18
+refs/heads/tswast-patch-1: 35ea69a5a4102de920f7732b52e29ebc8372d974
 refs/heads/pubsub-streaming-pull: 19262b752ee874eb2ca3b950eb2aef44d5a5267b
diff --git a/branches/tswast-patch-1/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/QueryResultsImpl.java b/branches/tswast-patch-1/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/QueryResultsImpl.java
@@ -34,6 +34,7 @@ class QueryResultsImpl<T> extends AbstractIterator<T> implements QueryResults<T>
   private Query<T> query;
   private ResultType<?> actualResultType;
   private com.google.datastore.v1beta3.QueryResultBatch queryResultBatchPb;
+  private com.google.datastore.v1beta3.Query mostRecentQueryPb;
   private boolean lastBatch;
   private Iterator<com.google.datastore.v1beta3.EntityResult> entityResultPbIter;
   private ByteString cursor;
@@ -58,7 +59,7 @@ class QueryResultsImpl<T> extends AbstractIterator<T> implements QueryResults<T>
     if (queryResultBatchPb.getSkippedResults() > 0) {
       cursor = queryResultBatchPb.getSkippedCursor();
     } else {
-      cursor = ByteString.EMPTY;
+      cursor = mostRecentQueryPb.getStartCursor();
     }
   }
 
@@ -70,7 +71,13 @@ private void sendRequest() {
     }
     requestPb.setPartitionId(partitionIdPb);
     query.populatePb(requestPb);
-    queryResultBatchPb = datastore.runQuery(requestPb.build()).getBatch();
+    com.google.datastore.v1beta3.RunQueryResponse runQueryResponsePb =
+        datastore.runQuery(requestPb.build());
+    queryResultBatchPb = runQueryResponsePb.getBatch();
+    mostRecentQueryPb = runQueryResponsePb.getQuery();
+    if (mostRecentQueryPb == null) {
+      mostRecentQueryPb = requestPb.getQuery();
+    }
     lastBatch = queryResultBatchPb.getMoreResults() != MoreResultsType.NOT_FINISHED;
     entityResultPbIter = queryResultBatchPb.getEntityResultsList().iterator();
     actualResultType = ResultType.fromPb(queryResultBatchPb.getEntityResultType());
