Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue #184: fix data race in SendAsync #186

Merged
merged 1 commit into from
May 8, 2019
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions uasc/secure_channel.go
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,10 @@ func (s *SecureChannel) SendAsync(svc interface{}, authToken *ua.NodeID) (resp c
if authToken == nil {
authToken = ua.NewTwoByteNodeID(0)
}

s.mu.Lock()
defer s.mu.Unlock()

// the request header is always the first field
val := reflect.ValueOf(svc)
val.Elem().Field(0).Set(reflect.ValueOf(s.reqhdr))
Expand Down Expand Up @@ -263,9 +267,9 @@ func (s *SecureChannel) SendAsync(svc interface{}, authToken *ua.NodeID) (resp c

// register the handler
resp = make(chan Response)
s.mu.Lock()
// s.mu.Lock()
s.handler[reqid] = resp
s.mu.Unlock()
//s.mu.Unlock()
return resp, nil
}

Expand Down