---

schmidt-sebastian · schmidt-sebastian · commit 891c1a9339cb · 2018-02-14T15:27:32.000-08:00
yaml --- r: 9041 b: "refs/heads/mrschmidt-__name___" c: effe274 h: refs/heads/master i: 9039: 0f829c7
diff --git a/[refs] b/[refs]
@@ -88,4 +88,4 @@ refs/tags/v0.29.0: d702b33b70f2e81853a142b4158227c5a88c8781
 refs/tags/v0.30.0: 9ea3a32084835d0499934e7c070af9f120747e88
 refs/heads/batching-expr: 95bc1ac20addaeb25ef65f62450593ed600484b9
 "refs/heads/datastore_orderby_tostring": 24a5a107969714ebb69a5a098f47658f7b1e8689
-"refs/heads/mrschmidt-__name___": 94949f1f33fa1272a3702b0f7a89c9102f0dc713
+"refs/heads/mrschmidt-__name___": effe27458f7d31b1d5ae1af6a5a228ce89c33462
diff --git a/branches/mrschmidt-__name___/google-cloud-firestore/src/main/java/com/google/cloud/firestore/Query.java b/branches/mrschmidt-__name___/google-cloud-firestore/src/main/java/com/google/cloud/firestore/Query.java
@@ -369,33 +369,31 @@ private Cursor createCursor(List<FieldOrder> order, Object[] fieldValues, boolea
    * a DocumentReference that can directly be used in the Query.
    */
   private Object convertReference(Object fieldValue) {
-    Object sanitizedValue;
-    DocumentReference cursorDocument;
+    DocumentReference reference;
     if (fieldValue instanceof String) {
-      cursorDocument = new DocumentReference(firestore, path.append((String) fieldValue));
+      reference = new DocumentReference(firestore, path.append((String) fieldValue));
     } else if (fieldValue instanceof DocumentReference) {
-      cursorDocument = (DocumentReference) fieldValue;
+      reference = (DocumentReference) fieldValue;
     } else {
       throw new IllegalArgumentException(
           "The corresponding value for FieldPath.documentId() must be a String or a "
               + "DocumentReference.");
     }
 
-    if (!this.path.isPrefixOf(cursorDocument.getResourcePath())) {
+    if (!this.path.isPrefixOf(reference.getResourcePath())) {
       throw new IllegalArgumentException(
           String.format(
               "'%s' is not part of the query result set and cannot be used as a query boundary.",
-              cursorDocument.getPath()));
+              reference.getPath()));
     }
-    if (!cursorDocument.getParent().getResourcePath().equals(this.path)) {
+    if (!reference.getParent().getResourcePath().equals(this.path)) {
       throw new IllegalArgumentException(
           String.format(
               "Only a direct child can be used as a query boundary. Found: '%s'",
-              cursorDocument.getPath()));
+              reference.getPath()));
     }
 
-    sanitizedValue = cursorDocument;
-    return sanitizedValue;
+    return reference;
   }
 
   /**
