SERVER-19414 Clean up ShardRegistry initialization

1 files changed, 5 insertions, 4 deletions

diff --git a/src/mongo/db/s/sharding_state.cpp b/src/mongo/db/s/sharding_state.cpp
index 1ca8eea8c1e..b0acbada38e 100644
--- a/src/mongo/db/s/sharding_state.cpp
+++ b/src/mongo/db/s/sharding_state.cpp
@@ -125,12 +125,13 @@ void ShardingState::initialize(const string& server) {
     auto catalogManager = stdx::make_unique<CatalogManagerLegacy>();
     uassertStatusOK(catalogManager->init(configServerCS));
 
+    auto network = executor::makeNetworkInterface();
+    auto networkPtr = network.get();
     auto shardRegistry(stdx::make_unique<ShardRegistry>(
         stdx::make_unique<RemoteCommandTargeterFactoryImpl>(),
-        stdx::make_unique<repl::ReplicationExecutor>(
-            executor::makeNetworkInterface().release(), nullptr, 0),
-        nullptr,
-        catalogManager.get()));
+        stdx::make_unique<repl::ReplicationExecutor>(network.release(), nullptr, 0),
+        networkPtr));
+    shardRegistry->init(catalogManager.get());
     shardRegistry->startup();
 
     grid.init(std::move(catalogManager), std::move(shardRegistry));