github
/
v2ray-core
mirror of https://github.com/v2ray/v2ray-core
1
0
Fork 0
Code Issues Releases Wiki Activity

fix a deadlock

pull/1132/merge
Darien Raymond 2018-05-31 13:12:36 +02:00
parent 4a46817cf6
commit ee0ca6cbd2
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/proxyman/inbound/worker.go
View File

@ -328,6 +328,8 @@ func (w *udpWorker) Start() error {
Execute: func() error { Execute: func() error {
nowSec := time.Now().Unix() nowSec := time.Now().Unix()
w.Lock() w.Lock()
defer w.Unlock()
if len(w.activeConn) == 0 { if len(w.activeConn) == 0 {
return nil return nil
} }
@ -342,7 +344,6 @@ func (w *udpWorker) Start() error {
if len(w.activeConn) == 0 { if len(w.activeConn) == 0 {
w.activeConn = make(map[connID]*udpConn, 16) w.activeConn = make(map[connID]*udpConn, 16)
} }
w.Unlock()
return nil return nil
}, },