From 2c87953010c2c1ec2d39dc9a7dbbd5f7d49dab10 Mon Sep 17 00:00:00 2001
From: Blake Oler <blake.oler@mongodb.com>
Date: Mon, 13 Apr 2020 12:12:39 -0400
Subject: SERVER-44972 Make ShardId a required field in StaleConfigInfo

---
 src/mongo/s/catalog_cache.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/mongo/s/catalog_cache.cpp')

diff --git a/src/mongo/s/catalog_cache.cpp b/src/mongo/s/catalog_cache.cpp
index 0ec5e8a7019..fe69cf19153 100644
--- a/src/mongo/s/catalog_cache.cpp
+++ b/src/mongo/s/catalog_cache.cpp
@@ -414,9 +414,9 @@ void CatalogCache::invalidateShardOrEntireCollectionEntryForShardedCollection(
     const NamespaceString& nss,
     boost::optional<ChunkVersion> wantedVersion,
     const ChunkVersion& receivedVersion,
-    boost::optional<ShardId> shardId) {
-    if (shardId && shardVersionsHaveMatchingEpoch(wantedVersion, receivedVersion)) {
-        _createOrGetCollectionEntryAndMarkShardStale(nss, *shardId);
+    ShardId shardId) {
+    if (shardVersionsHaveMatchingEpoch(wantedVersion, receivedVersion)) {
+        _createOrGetCollectionEntryAndMarkShardStale(nss, shardId);
     } else {
         _createOrGetCollectionEntryAndMarkEpochStale(nss);
     }
-- 
cgit v1.2.1