---

Ajay Kannan · Ajay Kannan · commit 5cea3d2c2381 · 2015-10-16T11:06:08.000-07:00
yaml --- r: 3783 b: refs/heads/pubsub-alpha c: 35ea69a h: refs/heads/master i: 3781: f8eddf5 3779: 25fcc24 3775: 862e1eb
diff --git a/[refs] b/[refs]
@@ -2,7 +2,7 @@
 refs/heads/master: 36a62ef856d199f8efd09501b5ba65c422c01f23
 refs/heads/travis: e21ee7b88a5edc3f3d8c71f90c3fc32abf7e8dd6
 refs/heads/gh-pages: 7406918e071dd2c5677a638ae2a06e7592b6542c
-refs/heads/pubsub-alpha: 0c2f9e93ffb78aadb55c3abf558e47c616336c18
+refs/heads/pubsub-alpha: 35ea69a5a4102de920f7732b52e29ebc8372d974
 refs/heads/update-datastore: 47aae517c2cb33f1dccd909adaced73ec9d0f4df
 refs/tags/0.0.9: 22f1839238f66c39e67ed4dfdcd273b1ae2e8444
 refs/tags/v0.0.10: 207ebd2a3472fddee69fe1298eb90429e3306efd
diff --git a/branches/pubsub-alpha/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/QueryResultsImpl.java b/branches/pubsub-alpha/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());
