Merge pull request #733 from ChannelMeter/fix/timer-reset-race

Fix Racy call to Reset in feederLoop
IBM · Aug 23, 2016 · 1639c3e · 1639c3e
2 parents 4f47ee4 + 779ef6a
commit 1639c3e
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/consumer.go b/consumer.go
@@ -420,10 +420,11 @@ feederLoop:
 		msgs, child.responseResult = child.parseResponse(response)
 
 		for i, msg := range msgs {
-			if !expiryTimer.Reset(child.conf.Consumer.MaxProcessingTime) {
+			if !expiryTimer.Stop() {
 				// expiryTimer was expired; clear out the waiting msg
 				<-expiryTimer.C
 			}
+			expiryTimer.Reset(child.conf.Consumer.MaxProcessingTime)
 
 			select {
 			case child.messages <- msg: