Commit2157bff

authored

fix: Clean up conn on NewStream error in memDRPC (#6182)

1 parentd355783 commit2157bffCopy full SHA for 2157bff

File tree

+13

-10

lines changed

+13

-10

lines changed

Lines changed: 13 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -110,15 +110,18 @@ func (m *memDRPC) NewStream(ctx context.Context, rpc string, enc drpc.Encoding)`
`110`	`110`	`}`
`111`	`111`	`dConn:=drpcconn.New(conn)`
`112`	`112`	`stream,err:=dConn.NewStream(ctx,rpc,enc)`
`113`		`-iferr==nil {`
`114`		`-gofunc() {`
`115`		`-select {`
`116`		`-case<-stream.Context().Done():`
`117`		`-case<-m.closed:`
`118`		`-}`
`119`		`-_=dConn.Close()`
`120`		`-_=conn.Close()`
`121`		`-}()`
	`113`	`+iferr!=nil {`
	`114`	`+_=dConn.Close()`
	`115`	`+_=conn.Close()`
	`116`	`+returnnil,err`
`122`	`117`	`}`
`123`		`-returnstream,err`
	`118`	`+gofunc() {`
	`119`	`+select {`
	`120`	`+case<-stream.Context().Done():`
	`121`	`+case<-m.closed:`
	`122`	`+}`
	`123`	`+_=dConn.Close()`
	`124`	`+_=conn.Close()`
	`125`	`+}()`
	`126`	`+returnstream,nil`
`124`	`127`	`}`

Comments

(0)