Merge pull request #330 from yunxi177/master

aceld · web-flow · commit fbd700038408 · 2024-07-12T14:36:41.000+08:00
connection isClose 方法判断,防止 c.ctx 不存在导致程序 panic
diff --git a/znet/connection.go b/znet/connection.go
@@ -544,9 +544,10 @@ func (c *Connection) GetMsgHandler() ziface.IMsgHandle {
 }
 
 func (c *Connection) isClosed() bool {
-	return c.ctx.Err() != nil
+	return c.ctx == nil || c.ctx.Err() != nil
 }
 
+
 func (c *Connection) setStartWriterFlag() bool {
 	return atomic.CompareAndSwapInt32(&c.startWriterFlag, 0, 1)
 }

Original file line number	Diff line number	Diff line change
`@@ -544,9 +544,10 @@ func (c *Connection) GetMsgHandler() ziface.IMsgHandle {`
`544`	`544`	`}`
`545`	`545`
`546`	`546`	`func (c *Connection) isClosed() bool {`
`547`		`- return c.ctx.Err() != nil`
	`547`	`+ return c.ctx == nil \|\| c.ctx.Err() != nil`
`548`	`548`	`}`
`549`	`549`
	`550`	`+`
`550`	`551`	`func (c *Connection) setStartWriterFlag() bool {`
`551`	`552`	`return atomic.CompareAndSwapInt32(&c.startWriterFlag, 0, 1)`
`552`	`553`	`}`