diff options
| author | Gregory Wlodarek <gregory.wlodarek@mongodb.com> | 2019-05-06 13:27:10 -0400 |
|---|---|---|
| committer | Gregory Wlodarek <gregory.wlodarek@mongodb.com> | 2019-05-07 07:58:41 -0400 |
| commit | 28de51de6adb41ce4cdb678812d37b726ff3a3f9 (patch) | |
| tree | e4c0aa58ebf68ed9a097eb129a54a3f7d29c220d /src/mongo/db/catalog_raii.cpp | |
| parent | 400e0500147836ba11ab611bdac2675d65cb7b48 (diff) | |
| download | mongo-28de51de6adb41ce4cdb678812d37b726ff3a3f9.tar.gz | |
SERVER-40964 Change lookupNSSByUUID to return boost::optional<NamespaceString> instead of NamespaceString
Diffstat (limited to 'src/mongo/db/catalog_raii.cpp')
| -rw-r--r-- | src/mongo/db/catalog_raii.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mongo/db/catalog_raii.cpp b/src/mongo/db/catalog_raii.cpp index f4b010e647b..5222dcf1843 100644 --- a/src/mongo/db/catalog_raii.cpp +++ b/src/mongo/db/catalog_raii.cpp @@ -162,15 +162,15 @@ NamespaceString AutoGetCollection::resolveNamespaceStringOrUUID(OperationContext uassert(ErrorCodes::NamespaceNotFound, str::stream() << "Unable to resolve " << nsOrUUID.toString(), - resolvedNss.isValid()); + resolvedNss && resolvedNss->isValid()); uassert(ErrorCodes::NamespaceNotFound, str::stream() << "UUID " << nsOrUUID.toString() << " specified in " << nsOrUUID.dbname() << " resolved to a collection in a different database: " - << resolvedNss.toString(), - resolvedNss.db() == nsOrUUID.dbname()); + << *resolvedNss, + resolvedNss->db() == nsOrUUID.dbname()); - return resolvedNss; + return *resolvedNss; } AutoGetOrCreateDb::AutoGetOrCreateDb(OperationContext* opCtx, |