Skip to content

Commit 51d362f

Browse files
authored
service/s3/s3manager: Fix return signature from conflicting changes (#407)
1 parent 11a6d37 commit 51d362f

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

service/s3/s3manager/upload.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -467,21 +467,21 @@ func (u *uploader) nextReader() (io.ReadSeeker, int, func(), error) {
467467

468468
default:
469469
part := u.cfg.partPool.Get().([]byte)
470+
cleanup := func() {
471+
u.cfg.partPool.Put(part)
472+
}
473+
470474
n, err := readFillBuf(r, part)
471475
if n < 0 {
472476
if err == nil {
473477
err = fmt.Errorf(
474478
"unable to read part, got negative bytes read(%d) without error, %v",
475479
n, err)
476480
}
477-
return nil, n, err
481+
return nil, n, cleanup, err
478482
}
479483
u.readerPos += int64(n)
480484

481-
cleanup := func() {
482-
u.cfg.partPool.Put(part)
483-
}
484-
485485
return bytes.NewReader(part[0:n]), n, cleanup, err
486486
}
487487
}

0 commit comments

Comments
 (0)