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

fix again the race condition issue

pull/123/head v1.11.2
v2ray 2016-04-19 14:51:52 +02:00
parent 1732d33ba9
commit 8c2b18cac4
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
transport/ray/direct.go
View File

@ -57,11 +57,13 @@ func (this *Stream) Read() (*alloc.Buffer, error) {
return nil, io.EOF
}
this.access.RLock()
defer this.access.RUnlock()
if this.buffer == nil {
this.access.RUnlock()
return nil, io.EOF
}
result, open := <-this.buffer
channel := this.buffer
this.access.RUnlock()
result, open := <-channel
if !open {
return nil, io.EOF
}
@ -72,17 +74,11 @@ func (this *Stream) Write(data *alloc.Buffer) error {
if this.closed {
return io.EOF
}
if this.buffer == nil {
return io.EOF
}
this.access.RLock()
defer this.access.RUnlock()
if this.closed {
return io.EOF
}
if this.buffer == nil {
return io.EOF
}
this.buffer <- data
return nil
}
@ -91,8 +87,8 @@ func (this *Stream) Close() {
if this.closed {
return
}
this.access.RLock()
defer this.access.RUnlock()
this.access.Lock()
defer this.access.Unlock()
if this.closed {
return
}