Darien Raymond 6 years ago
parent
commit
ce91e92435
2 changed files with 6 additions and 5 deletions
  1. 5 4
      common/buf/reader.go
  2. 1 1
      common/net/connection.go

+ 5 - 4
common/buf/reader.go

@@ -148,12 +148,13 @@ func (r *BufferedReader) WriteTo(writer io.Writer) (int64, error) {
 	return nBytes, err
 }
 
+// Interrupt implements common.Interruptible.
+func (r *BufferedReader) Interrupt() {
+	common.Interrupt(r.Reader)
+}
+
 // Close implements io.Closer.
 func (r *BufferedReader) Close() error {
-	if !r.Buffer.IsEmpty() {
-		ReleaseMulti(r.Buffer)
-		r.Buffer = nil
-	}
 	return common.Close(r.Reader)
 }
 

+ 1 - 1
common/net/connection.go

@@ -115,7 +115,7 @@ func (c *connection) WriteMultiBuffer(mb buf.MultiBuffer) error {
 // Close implements net.Conn.Close().
 func (c *connection) Close() error {
 	common.Must(c.done.Close())
-	common.Close(c.reader)
+	common.Interrupt(c.reader)
 	common.Close(c.writer)
 	if c.onClose != nil {
 		return c.onClose.Close()