summaryrefslogtreecommitdiff
path: root/src/mongo/client/parallel.cpp
diff options
context:
space:
mode:
authorLaszlo Boszormenyi (GCS) <gcs@debian.org>2015-08-08 18:57:06 +0200
committerFathi Boudra <fabo@debian.org>2015-12-15 11:15:36 +0200
commit34eb495f9fee1acb705465102a8ae5f5b78cb149 (patch)
tree39f258113dafec114383eee975c2c718d4235227 /src/mongo/client/parallel.cpp
parenteb56ab9a71cbca16969e19586c9aad2136c24875 (diff)
parentb19ca2d7025ec90a916906e912f3c97113da38b2 (diff)
Imported Debian patch 1:2.4.14-3debian/2.4.14-3
Diffstat (limited to 'src/mongo/client/parallel.cpp')
-rw-r--r--src/mongo/client/parallel.cpp9
1 files changed, 1 insertions, 8 deletions
diff --git a/src/mongo/client/parallel.cpp b/src/mongo/client/parallel.cpp
index 7dcc7573df0..e9dbc644eae 100644
--- a/src/mongo/client/parallel.cpp
+++ b/src/mongo/client/parallel.cpp
@@ -540,14 +540,7 @@ namespace mongo {
if( full || errored ) retryNext = false;
if( ! retryNext && pcState ){
-
- if( errored && pcState->conn ){
- // Don't return this conn to the pool if it's bad
- pcState->conn->kill();
- pcState->conn.reset();
- }
- else if( initialized ){
-
+ if (initialized && !errored) {
verify( pcState->cursor );
verify( pcState->conn );