From ff10cbf67b8a62cf8d7b4401989f1e91745642e4 Mon Sep 17 00:00:00 2001 From: Andy Wang Date: Sun, 7 Jun 2020 12:16:08 +0100 Subject: [PATCH] Revert "Fix WriteTo receive loop" This reverts commit 501f7dda Address #117 --- internal/multiplex/bufferedPipe.go | 3 ++- internal/multiplex/datagramBuffer.go | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/internal/multiplex/bufferedPipe.go b/internal/multiplex/bufferedPipe.go index 7652cc9..ea3f87e 100644 --- a/internal/multiplex/bufferedPipe.go +++ b/internal/multiplex/bufferedPipe.go @@ -92,8 +92,9 @@ func (p *bufferedPipe) WriteTo(w io.Writer) (n int64, err error) { return n, er } p.rwCond.Broadcast() + } else { + p.rwCond.Wait() } - p.rwCond.Wait() } } diff --git a/internal/multiplex/datagramBuffer.go b/internal/multiplex/datagramBuffer.go index c3ea771..e802e0a 100644 --- a/internal/multiplex/datagramBuffer.go +++ b/internal/multiplex/datagramBuffer.go @@ -98,8 +98,9 @@ func (d *datagramBuffer) WriteTo(w io.Writer) (n int64, err error) { return n, er } d.rwCond.Broadcast() + } else { + d.rwCond.Wait() } - d.rwCond.Wait() } }