Merge pull request #114 from nats-io/fix_data_race

Fix data race on client close
nats-io · Jun 23, 2016 · a92d865 · a92d865
2 parents 4d3c783 + 6cd1c02
commit a92d865
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/server/server.go b/server/server.go
@@ -306,7 +306,12 @@ func (ss *subStore) Remove(sub *subState, force bool) {
 
 	// Delete ourselves from the list
 	if qs != nil {
+		// For queue state, we need to lock specifically,
+		// because qs.subs can be modified by findBestQueueSub,
+		// for which we don't have substore lock held.
+		qs.Lock()
 		qs.subs, _ = sub.deleteFromList(qs.subs)
+		qs.Unlock()
 	} else {
 		ss.psubs, _ = sub.deleteFromList(ss.psubs)
 	}