1
0
mirror of https://github.com/v2fly/v2ray-core.git synced 2026-05-15 08:59:07 -04:00

handle read with data and error at same time

This commit is contained in:
Darien Raymond
2017-11-24 23:16:01 +01:00
parent 96a7587164
commit 2fdccb2424
4 changed files with 72 additions and 43 deletions

View File

@@ -82,23 +82,19 @@ func CountSize(sc *SizeCounter) CopyOption {
func copyInternal(reader Reader, writer Writer, handler *copyHandler) error {
for {
buffer, err := handler.readFrom(reader)
if !buffer.IsEmpty() {
for _, handler := range handler.onData {
handler(buffer)
}
if werr := handler.writeTo(writer, buffer); werr != nil {
buffer.Release()
return werr
}
}
if err != nil {
return err
}
if buffer.IsEmpty() {
buffer.Release()
continue
}
for _, handler := range handler.onData {
handler(buffer)
}
if err := handler.writeTo(writer, buffer); err != nil {
buffer.Release()
return err
}
}
}