Merge pull request #730 from mistsys/master

fix erronous errTimedOut ("abandoned subscription...because consuming…
IBM · Aug 16, 2016 · 4f47ee4 · 4f47ee4
2 parents f4a6263 + 906ed72
commit 4f47ee4
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/consumer.go b/consumer.go
@@ -420,7 +420,10 @@ feederLoop:
 		msgs, child.responseResult = child.parseResponse(response)
 
 		for i, msg := range msgs {
-			expiryTimer.Reset(child.conf.Consumer.MaxProcessingTime)
+			if !expiryTimer.Reset(child.conf.Consumer.MaxProcessingTime) {
+				// expiryTimer was expired; clear out the waiting msg
+				<-expiryTimer.C
+			}
 
 			select {
 			case child.messages <- msg: