diff options
| author | Randolph Tan <randolph@10gen.com> | 2014-08-29 13:18:36 -0400 |
|---|---|---|
| committer | Randolph Tan <randolph@10gen.com> | 2014-09-08 14:09:41 -0400 |
| commit | 59dc05c0b60be7097723020dd59c370f06041c1d (patch) | |
| tree | 4756363b2636dab6d4e74276111ebb7672ce8b80 | |
| parent | d5a8cfd7bddcc0c4bc63bc637dc744bcbf0bfb8a (diff) | |
| download | mongo-59dc05c0b60be7097723020dd59c370f06041c1d.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 cbd7684d688..e9dbc644eae 100644 --- a/src/mongo/client/parallel.cpp +++ b/src/mongo/client/parallel.cpp @@ -540,12 +540,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 ); |