AC-14558::Migration form RabbitMQ to Apache ActiveMQ

Author: del72683

app/code/Magento/MessageQueue/Model/CheckIsAvailableMessagesInQueue.php

@@ -46,11 +46,16 @@ public function execute($connectionName, $queueName)
         }
         if ($connectionName === 'stomp') {
             $queue->subscribeQueue();
-        }
-        $message = $queue->dequeue();
-        if ($message) {
-            $queue->reject($message);
-            return true;
+            $message = $queue->readMessage();
+            if ($message) {
+                return true;
+            }
+        } else {
+            $message = $queue->dequeue();
+            if ($message) {
+                $queue->reject($message);
+                return true;
+            }
         }
         return false;
     }

lib/internal/Magento/Framework/Stomp/Queue.php

@@ -234,7 +234,7 @@ public function push(EnvelopeInterface $envelope)
      * @return Frame|null
      * @throws ConnectionLostException
      */
-    private function readMessage(): ?Frame
+    public function readMessage(): ?Frame
     {
         $message = null;
         $stompClient = $this->getStompConsumerClient();