SERVER-44517 Refactor exhaust cursors on top of isMaster code changes

1 files changed, 3 insertions, 6 deletions

diff --git a/src/mongo/s/commands/strategy.cpp b/src/mongo/s/commands/strategy.cpp
index c80ed6e0956..61f692f315a 100644
--- a/src/mongo/s/commands/strategy.cpp
+++ b/src/mongo/s/commands/strategy.cpp
@@ -873,14 +873,11 @@ DbResponse Strategy::clientCommand(OperationContext* opCtx, const Message& m) {
     }
 
     DbResponse dbResponse;
-    dbResponse.shouldRunAgainForExhaust = reply->shouldRunAgainForExhaust();
-    dbResponse.nextInvocation = reply->getNextInvocation();
     if (OpMsg::isFlagSet(m, OpMsg::kExhaustSupported)) {
         auto responseObj = reply->getBodyBuilder().asTempObj();
-        auto cursorObj = responseObj.getObjectField("cursor");
-        if (responseObj.getField("ok").trueValue() && !cursorObj.isEmpty()) {
-            dbResponse.exhaustNS = cursorObj.getField("ns").String();
-            dbResponse.exhaustCursorId = cursorObj.getField("id").numberLong();
+        if (responseObj.getField("ok").trueValue()) {
+            dbResponse.shouldRunAgainForExhaust = reply->shouldRunAgainForExhaust();
+            dbResponse.nextInvocation = reply->getNextInvocation();
         }
     }
     dbResponse.response = reply->done();