From dd02c7ce42ec3df71b0172813eafabaf38b04cfd Mon Sep 17 00:00:00 2001
From: Bhaskar Mallapragada <bhaskar.mallapragada@microsoft.com>
Date: Fri, 23 Oct 2020 15:36:08 -0700
Subject: [PATCH] Fix to prevent a race condition in continuation token. This
 was part of the earlier V4 branch, but got overwritten during merge.

---
 .../azure/cosmos/implementation/query/DocumentProducer.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/query/DocumentProducer.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/query/DocumentProducer.java
index d7bd9a56153b..7f3622d00374 100644
--- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/query/DocumentProducer.java
+++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/query/DocumentProducer.java
@@ -147,7 +147,9 @@ public DocumentProducer(
 
         this.correlatedActivityId = correlatedActivityId;
 
-        this.cosmosQueryRequestOptions = cosmosQueryRequestOptions != null ? cosmosQueryRequestOptions : new CosmosQueryRequestOptions();
+        this.cosmosQueryRequestOptions = cosmosQueryRequestOptions != null ?
+                                             ModelBridgeInternal.createQueryRequestOptions(cosmosQueryRequestOptions)
+                                             : new CosmosQueryRequestOptions();
         ModelBridgeInternal.setQueryRequestOptionsContinuationToken(this.cosmosQueryRequestOptions, initialContinuationToken);
         this.lastResponseContinuationToken = initialContinuationToken;
         this.resourceType = resourceType;