From 728c7df7e79a7c988424942ac33f44e99a3e8776 Mon Sep 17 00:00:00 2001 From: Dom Date: Mon, 11 Jun 2018 11:35:50 +0100 Subject: [PATCH] revert: MGO-156 Avoid iter.Next deadlock on dead sockets (#182) (#188) This reverts commit 7253b2be6df6d0d36d370c641cdbc82b8abe41d8. --- session.go | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/session.go b/session.go index 7bdfef964..c053dba39 100644 --- a/session.go +++ b/session.go @@ -4545,13 +4545,7 @@ func (iter *Iter) getMore() { } else { op = &iter.op } - // We unlock the iterator around socket.Query because it will call the - // replyFunc if the socket is dead, which would deadlock if the iterator - // were still locked. - iter.m.Unlock() - err = socket.Query(op) - iter.m.Lock() - if err != nil { + if err := socket.Query(op); err != nil { iter.docsToReceive-- iter.err = err }