Do not stack retry stamp

jderusse · jderusse · commit 7f39c5a9ef8a · 2020-05-16T11:06:50.000+02:00
diff --git a/src/Symfony/Component/Messenger/EventListener/SendFailedMessageForRetryListener.php b/src/Symfony/Component/Messenger/EventListener/SendFailedMessageForRetryListener.php
@@ -64,7 +64,7 @@ public function onMessageFailed(WorkerMessageFailedEvent $event)
             }
 
             // add the delay and retry stamp info
-            $retryEnvelope = $envelope->with(new DelayStamp($delay), new RedeliveryStamp($retryCount));
+            $retryEnvelope = $envelope->withoutAll(DelayStamp::class)->withoutAll(RedeliveryStamp::class)->with(new DelayStamp($delay), new RedeliveryStamp($retryCount));
 
             // re-send the message for retry
             $this->getSenderForTransport($event->getReceiverName())->send($retryEnvelope);

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ public function onMessageFailed(WorkerMessageFailedEvent $event)`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`5F6A // add the delay and retry stamp info`
`67`		`- $retryEnvelope = $envelope->with(new DelayStamp($delay), new RedeliveryStamp($retryCount));`
	`67`	`+ $retryEnvelope = $envelope->withoutAll(DelayStamp::class)->withoutAll(RedeliveryStamp::class)->with(new DelayStamp($delay), new RedeliveryStamp($retryCount));`
`68`	`68`
`69`	`69`	`// re-send the message for retry`
`70`	`70`	`$this->getSenderForTransport($event->getReceiverName())->send($retryEnvelope);`