summaryrefslogtreecommitdiff
path: root/src/mongo/s/client
diff options
context:
space:
mode:
authorMathias Stearn <mathias@10gen.com>2017-08-10 15:52:33 -0400
committerMathias Stearn <mathias@10gen.com>2017-08-16 16:28:02 -0400
commit347935f7a5d0452146b1a73ad7ef9e249eaf1fb5 (patch)
tree00b322f5adcf3eb9c2624747a6b5b2179e440052 /src/mongo/s/client
parentcdf7aacb213c99d3ce620761ff46b030bbd7732d (diff)
downloadmongo-347935f7a5d0452146b1a73ad7ef9e249eaf1fb5.tar.gz
SERVER-30580 Eliminate UserException and MsgAssertionException types
All users were converted to just use AssertionException.
Diffstat (limited to 'src/mongo/s/client')
-rw-r--r--src/mongo/s/client/parallel.cpp2
-rw-r--r--src/mongo/s/client/sharding_connection_hook.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/mongo/s/client/parallel.cpp b/src/mongo/s/client/parallel.cpp
index a7ddaefbe54..23594f586da 100644
--- a/src/mongo/s/client/parallel.cpp
+++ b/src/mongo/s/client/parallel.cpp
@@ -68,7 +68,7 @@ void throwCursorError(DBClientCursor* cursor) {
if (cursor->hasResultFlag(ResultFlag_ErrSet)) {
BSONObj o = cursor->next();
- throw UserException(o["code"].numberInt(), o["$err"].str());
+ throw AssertionException(o["code"].numberInt(), o["$err"].str());
}
}
diff --git a/src/mongo/s/client/sharding_connection_hook.cpp b/src/mongo/s/client/sharding_connection_hook.cpp
index 743a158ca13..f2325d4c88a 100644
--- a/src/mongo/s/client/sharding_connection_hook.cpp
+++ b/src/mongo/s/client/sharding_connection_hook.cpp
@@ -54,8 +54,8 @@ ShardingConnectionHook::ShardingConnectionHook(bool shardedConnections,
void ShardingConnectionHook::onCreate(DBClientBase* conn) {
if (conn->type() == ConnectionString::INVALID) {
- throw UserException(ErrorCodes::BadValue,
- str::stream() << "Unrecognized connection string.");
+ throw AssertionException(ErrorCodes::BadValue,
+ str::stream() << "Unrecognized connection string.");
}
// Authenticate as the first thing we do