Merge pull request #286 from xiongyuhmba/master

解决connection模块写时，出现往空的channel写的panic错误
aceld · Nov 24, 2023 · 4951f22 · 4951f22
2 parents 7ab8f15 + 459e417
commit 4951f22
Showing 1 changed file with 2 additions and 13 deletions.
diff --git a/znet/connection.go b/znet/connection.go
@@ -507,11 +507,6 @@ func (c *Connection) finalizer() {
 		c.connManager.Remove(c)
 	}
 
-	// Close all channels associated with the connection
-	if c.msgBuffChan != nil {
-		close(c.msgBuffChan)
-	}
-
 	zlog.Ins().InfoF("Conn Stop()...ConnID = %d", c.connID)
 }
 
@@ -568,15 +563,9 @@ func (c *Connection) isClosed() bool {
 }
 
 func (c *Connection) setClose() bool {
-	if atomic.CompareAndSwapInt32(&c.closed, 0, 1) {
-		return true
-	}
-	return false
+	return atomic.CompareAndSwapInt32(&c.closed, 0, 1)
 }
 
 func (c *Connection) setStartWriterFlag() bool {
-	if atomic.CompareAndSwapInt32(&c.startWriterFlag, 0, 1) {
-		return true
-	}
-	return false
+	return atomic.CompareAndSwapInt32(&c.startWriterFlag, 0, 1)
 }