From cd7a8595d978a016cc070d973585e5f77a243f7e Mon Sep 17 00:00:00 2001 From: Darien Raymond Date: Mon, 23 Jul 2018 23:39:55 +0200 Subject: [PATCH] fix #1207 --- app/dispatcher/default.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/app/dispatcher/default.go b/app/dispatcher/default.go index 8a0e6fe04..6f8adc6c2 100644 --- a/app/dispatcher/default.go +++ b/app/dispatcher/default.go @@ -46,7 +46,7 @@ func (r *cachedReader) ReadMultiBuffer() (buf.MultiBuffer, error) { r.Lock() defer r.Unlock() - if !r.cache.IsEmpty() { + if r.cache != nil && !r.cache.IsEmpty() { mb := r.cache r.cache = nil return mb, nil @@ -59,7 +59,7 @@ func (r *cachedReader) ReadMultiBufferTimeout(timeout time.Duration) (buf.MultiB r.Lock() defer r.Unlock() - if !r.cache.IsEmpty() { + if r.cache != nil && !r.cache.IsEmpty() { mb := r.cache r.cache = nil return mb, nil @@ -70,8 +70,10 @@ func (r *cachedReader) ReadMultiBufferTimeout(timeout time.Duration) (buf.MultiB func (r *cachedReader) CloseError() { r.Lock() - r.cache.Release() - r.cache = nil + if r.cache != nil { + r.cache.Release() + r.cache = nil + } r.Unlock() r.reader.CloseError() }