diff options
| author | Randolph Tan <randolph@10gen.com> | 2014-08-29 13:18:36 -0400 |
|---|---|---|
| committer | Randolph Tan <randolph@10gen.com> | 2014-09-08 11:52:29 -0400 |
| commit | d49ca8030322d39d9b02b9dea3b944ff5b34c170 (patch) | |
| tree | 6cd89f4bd1630d520e582bfefc92cb3c49e178ec | |
| parent | 7c0a72f1bab791e2f07ef1e86ab63d9eaf0d021d (diff) | |
| download | mongo-d49ca8030322d39d9b02b9dea3b944ff5b34c170.tar.gz | |
SERVER-15056 Sharded connection cleanup on setup error can crash mongos
Collapse empty if body
(cherry picked from commit 87fa4e16af935e1c9c870878898ce46eacdea4e4)
| -rw-r--r-- | src/mongo/client/parallel.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/mongo/client/parallel.cpp b/src/mongo/client/parallel.cpp index f61549574b5..88ee0a35d1b 100644 --- a/src/mongo/client/parallel.cpp +++ b/src/mongo/client/parallel.cpp @@ -401,12 +401,7 @@ namespace mongo { if( full || errored ) retryNext = false; if( ! retryNext && pcState ){ - - if( errored && pcState->conn ){ - // Connection will cleanup for itself. Do nothing. - } - else if( initialized ){ - + if (initialized && !errored) { verify( pcState->cursor ); verify( pcState->conn ); |