diff options
Diffstat (limited to 'src/mongo')
| -rw-r--r-- | src/mongo/db/catalog/collection_catalog.cpp | 4 | ||||
| -rw-r--r-- | src/mongo/db/ops/write_ops_exec.cpp | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/mongo/db/catalog/collection_catalog.cpp b/src/mongo/db/catalog/collection_catalog.cpp index aaaf68d6bd3..34665a8f893 100644 --- a/src/mongo/db/catalog/collection_catalog.cpp +++ b/src/mongo/db/catalog/collection_catalog.cpp @@ -1271,7 +1271,9 @@ void CollectionCatalog::_ensureNamespaceDoesNotExist(OperationContext* opCtx, 5725003, "Conflicted registering namespace, already have a view with the same namespace", "nss"_attr = nss); - throw WriteConflictException(); + uasserted(ErrorCodes::NamespaceExists, + "Conflicted registering namespace, already have a view with the same " + "namespace"); } } } diff --git a/src/mongo/db/ops/write_ops_exec.cpp b/src/mongo/db/ops/write_ops_exec.cpp index d1afdc8dde9..683e11d4d70 100644 --- a/src/mongo/db/ops/write_ops_exec.cpp +++ b/src/mongo/db/ops/write_ops_exec.cpp @@ -238,8 +238,7 @@ void makeCollection(OperationContext* opCtx, const NamespaceString& ns) { assertCanWrite_inlock(opCtx, ns); if (!CollectionCatalog::get(opCtx)->lookupCollectionByNamespace( - opCtx, - ns)) { // someone else may have beat us to it. + opCtx, ns)) { // someone else may have beat us to it. uassertStatusOK(userAllowedCreateNS(opCtx, ns)); OperationShardingState::ScopedAllowImplicitCollectionCreate_UNSAFE unsafeCreateCollection(opCtx); |