---

Ajay Kannan · Ajay Kannan · commit 1d80281e91d9 · 2015-10-16T11:06:08.000-07:00
yaml --- r: 4221 b: refs/heads/gcs-nio c: 35ea69a h: refs/heads/master i: 4219: 01854b2
diff --git a/[refs] b/[refs]
@@ -11,7 +11,7 @@ refs/tags/v0.0.12: 2fd8066e891fb3dfea69b65f6bf6461db79342b9
 refs/heads/compute-alpha: 969cba2627f1d53d352cc4a5ffe0879dacf65e6c
 refs/heads/dns-alpha: 2f90e7e338349287ace33375896907af0f032ca1
 refs/heads/dns-alpha-batch: 17442b07867021b85d0452f5f3eda29a3413288f
-refs/heads/gcs-nio: 0c2f9e93ffb78aadb55c3abf558e47c616336c18
+refs/heads/gcs-nio: 35ea69a5a4102de920f7732b52e29ebc8372d974
 refs/heads/logging-alpha: db5312bffa7fccac194f6a7feb8cc3066de16aff
 refs/tags/v0.1.0: a615317f7424ed58621b1f65d5c4d8cbbe8a6ed8
 refs/tags/v0.1.1: 7a7f6985fe465e9dd6a075af55493f42b4933be0
diff --git a/branches/gcs-nio/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/QueryResultsImpl.java b/branches/gcs-nio/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());
