Skip to content

Commit 37f7720

Browse files
committed
Close connection when limit reached in legacyGetMore of driverlegacy.BatchCursor
GODRIVER-1096 Change-Id: Ifd48f555c9850db28c2de3010db908a7e7a5b652
1 parent 422bc3b commit 37f7720

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

x/mongo/driver/batch_cursor.go

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -333,23 +333,24 @@ func (bc *BatchCursor) legacyGetMore(ctx context.Context) {
333333
return
334334
}
335335

336-
conn, err := bc.server.Connection(ctx)
337-
if err != nil {
338-
bc.err = err
339-
return
340-
}
341-
342336
numToReturn := bc.batchSize
343337
if bc.limit != 0 && bc.numReturned+bc.batchSize > bc.limit {
344338
numToReturn = bc.limit - bc.numReturned
345339
if numToReturn <= 0 {
346-
err = bc.Close(ctx)
340+
err := bc.Close(ctx)
347341
if err != nil {
348342
bc.err = err
349343
}
350344
return
351345
}
352346
}
347+
348+
conn, err := bc.server.Connection(ctx)
349+
if err != nil {
350+
bc.err = err
351+
return
352+
}
353+
353354
gm := wiremessage.GetMore{
354355
FullCollectionName: bc.namespace.DB + "." + bc.namespace.Collection,
355356
CursorID: bc.id,

0 commit comments

Comments
 (0)