SERVER-28749 Unify ServiceEntryPointMongod and ServiceEntryPointMongos

2 files changed, 8 insertions, 4 deletions

diff --git a/src/mongo/client/dbclientcursor.cpp b/src/mongo/client/dbclientcursor.cpp
index bb74398b35f..db37bea3bf0 100644
--- a/src/mongo/client/dbclientcursor.cpp
+++ b/src/mongo/client/dbclientcursor.cpp
@@ -249,10 +249,8 @@ void DBClientCursor::commandDataReceived() {
     // HACK: If we got an OP_COMMANDREPLY, take the reply object
     // and shove it in to an OP_REPLY message.
     if (op == dbCommandReply) {
-        // Need to take ownership here as we destroy the underlying message.
-        BSONObj reply = commandReply->getCommandReply().getOwned();
-        batch.m.reset();
-        replyToQuery(0, batch.m, reply);
+        BSONObj reply = commandReply->getCommandReply();
+        batch.m = replyToQuery(reply).response;
     }
 
     QueryResult::View qr = batch.m.singleData().view2ptr();
diff --git a/src/mongo/client/scoped_db_conn_test.cpp b/src/mongo/client/scoped_db_conn_test.cpp
index 41ae8d1af0c..57d196e7a88 100644
--- a/src/mongo/client/scoped_db_conn_test.cpp
+++ b/src/mongo/client/scoped_db_conn_test.cpp
@@ -95,6 +95,12 @@ public:
         _replyDelay = delay;
     }
 
+    DbResponse handleRequest(OperationContext* opCtx,
+                             const Message& request,
+                             const HostAndPort& client) override {
+        MONGO_UNREACHABLE;
+    }
+
 private:
     void run(transport::SessionHandle session) {
         Message inMessage;