Update upstream source from tag 'upstream/6.0.0'master

Update to upstream version '6.0.0'
with Debian dir 5604a80ec1c96ca76f25f40d78e6ef855abec322

1 files changed, 4 insertions, 4 deletions

diff --git a/src/mongo/db/logical_time_validator.cpp b/src/mongo/db/logical_time_validator.cpp
index 8b2b5ddcf07..2b65ad4470c 100644
--- a/src/mongo/db/logical_time_validator.cpp
+++ b/src/mongo/db/logical_time_validator.cpp
@@ -55,7 +55,7 @@ MONGO_FAIL_POINT_DEFINE(externalClientsNeverAuthorizedToAdvanceLogicalClock);
 MONGO_FAIL_POINT_DEFINE(throwClientDisconnectInSignLogicalTimeForExternalClients);
 
 const auto getLogicalTimeValidator =
-    ServiceContext::declareDecoration<std::shared_ptr<LogicalTimeValidator>>();
+    ServiceContext::declareDecoration<std::unique_ptr<LogicalTimeValidator>>();
 
 Mutex validatorMutex;  // protects access to decoration instance of LogicalTimeValidator.
 
@@ -71,12 +71,12 @@ Milliseconds kRefreshIntervalIfErrored(200);
 
 }  // unnamed namespace
 
-std::shared_ptr<LogicalTimeValidator> LogicalTimeValidator::get(ServiceContext* service) {
+LogicalTimeValidator* LogicalTimeValidator::get(ServiceContext* service) {
     stdx::lock_guard<Latch> lk(validatorMutex);
-    return getLogicalTimeValidator(service);
+    return getLogicalTimeValidator(service).get();
 }
 
-std::shared_ptr<LogicalTimeValidator> LogicalTimeValidator::get(OperationContext* ctx) {
+LogicalTimeValidator* LogicalTimeValidator::get(OperationContext* ctx) {
     return get(ctx->getClient()->getServiceContext());
 }