Should no longer be possible to get into an infinite loop when auto-d…

…eclaring exchanges and queues (#9)
packaged · Sep 14, 2017 · ab6f636 · ab6f636
1 parent 776f6dc
commit ab6f636
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/Provider/Amqp/AmqpQueueProvider.php b/src/Provider/Amqp/AmqpQueueProvider.php
@@ -109,7 +109,7 @@ public function pushBatch(array $batch, $persistent = null)
         $exchange,
         $routingKey
       ) use (&$needRetry, &$needDeclare, &$autoDeclare) {
-        if($autoDeclare && ($replyCode == 312))
+        if($autoDeclare && (!$needDeclare) && ($replyCode == 312))
         {
           $needDeclare = true;
           $needRetry = true;
@@ -170,7 +170,7 @@ public function pushBatch(array $batch, $persistent = null)
         catch(\Exception $e)
         {
           $this->disconnectAll();
-          if($autoDeclare && ($e->getCode() == 404))
+          if($autoDeclare && (!$needDeclare) && ($e->getCode() == 404))
           {
             $needRetry = true;
             $needDeclare = true;