Merge pull request #186 from gopcua/issue-184-send-async-race

Issue #184: fix data race in SendAsync
gopcua · May 8, 2019 · b11b575 · b11b575
2 parents 30ab0b8 + 38df7fa
commit b11b575
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/uasc/secure_channel.go b/uasc/secure_channel.go
@@ -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))
@@ -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
 }