Skip to content

Commit 0d1bda3

Browse files
Dnyaneshwar S JambhulkarDnyaneshwar S Jambhulkar
authored andcommitted
AC-15524::Make the queue dependency optional in queue_publisher.xml and use the topic if the queue attribute is not available.
1 parent b1846f1 commit 0d1bda3

File tree

3 files changed

+8
-5
lines changed

3 files changed

+8
-5
lines changed

app/code/Magento/Stomp/Model/Bulk/Publisher.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,9 @@ public function publish($topicName, $data)
106106

107107
$publisher = $this->publisherConfig->getPublisher($topicName);
108108
$connectionName = $publisher->getConnection()->getName();
109-
$queue = $this->queueRepository->get($connectionName, $publisher->getQueue());
110-
$bulkQueue = $this->bulkQueueRepository->get($connectionName, $publisher->getQueue());
109+
$queueName = $publisher->getQueue() ? $publisher->getQueue(): $topicName;
110+
$queue = $this->queueRepository->get($connectionName, $queueName);
111+
$bulkQueue = $this->bulkQueueRepository->get($connectionName, $queueName);
111112
$bulkQueue->push($queue, $topicName, $envelopes);
112113

113114
return null;

app/code/Magento/Stomp/Model/MassPublisher.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,9 @@ public function publish($topicName, $data)
110110

111111
$publisher = $this->publisherConfig->getPublisher($topicName);
112112
$connectionName = $publisher->getConnection()->getName();
113-
$queue = $this->queueRepository->get($connectionName, $publisher->getQueue());
114-
$bulkQueue = $this->bulkQueueRepository->get($connectionName, $publisher->getQueue());
113+
$queueName = $publisher->getQueue() ? $publisher->getQueue(): $topicName;
114+
$queue = $this->queueRepository->get($connectionName, $queueName);
115+
$bulkQueue = $this->bulkQueueRepository->get($connectionName, $queueName);
115116
$bulkQueue->push($queue, $topicName, $envelopes);
116117

117118
return null;

app/code/Magento/Stomp/Model/Publisher.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,8 @@ public function publish($topicName, $data)
9494

9595
$publisher = $this->publisherConfig->getPublisher($topicName);
9696
$connectionName = $publisher->getConnection()->getName();
97-
$queue = $this->queueRepository->get($connectionName, $publisher->getQueue());
97+
$queueName = $publisher->getQueue() ? $publisher->getQueue(): $topicName;
98+
$queue = $this->queueRepository->get($connectionName, $queueName);
9899

99100
$queue->push($envelope);
100101
return null;

0 commit comments

Comments
 (0)