[activemq-artemis] branch master updated: ARTEMIS-3018 - Console dlq pref doesn work with multiple dlq's

[clebertsuconic]

This is an automated email from the ASF dual-hosted git repository.

clebertsuconic pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git


The following commit(s) were added to refs/heads/master by this push:
     new 232c7b1  ARTEMIS-3018 - Console dlq pref doesn work with multiple dlq's
     new 12cd10a  This closes #3368
232c7b1 is described below

commit 232c7b16aa58257f17cf95d0e27461a57e9a9656
Author: Andy Taylor <andy.tayl...@gmail.com>
AuthorDate: Fri Dec 4 12:25:39 2020 +0000

    ARTEMIS-3018 - Console dlq pref doesn work with multiple dlq's
    
    https://issues.apache.org/jira/browse/ARTEMIS-3018
---
 .../artemis-plugin/src/main/webapp/plugin/js/components/browse.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git 
a/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/components/browse.js 
b/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/components/browse.js
index 4832685..8a1fef0 100644
--- 
a/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/components/browse.js
+++ 
b/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/components/browse.js
@@ -194,8 +194,8 @@ var Artemis;
         Artemis.log.debug("loading table" + artemisExpiryQueue);
         if (objName) {
             ctrl.dlq = false;
-            var queueName = jolokia.getAttribute(objName, "Name");
-            if (queueName == artemisDLQ || queueName == artemisExpiryQueue) {
+            var addressName = jolokia.getAttribute(objName, "Address");
+            if (addressName == artemisDLQ || addressName == 
artemisExpiryQueue) {
                 ctrl.dlq = true;
             }
         }
@@ -682,11 +682,11 @@ var Artemis;
             }
             if (objName) {
                 ctrl.dlq = false;
-                var queueName = jolokia.getAttribute(objName, "Name");
+                var addressName = jolokia.getAttribute(objName, "Address");
                 var artemisDLQ = localStorage['artemisDLQ'] || "DLQ";
                 var artemisExpiryQueue = localStorage['artemisExpiryQueue'] || 
"ExpiryQueue";
                 Artemis.log.debug("loading table" + artemisExpiryQueue);
-                if (queueName == artemisDLQ || queueName == 
artemisExpiryQueue) {
+                if (addressName == artemisDLQ || addressName == 
artemisExpiryQueue) {
                     onDlq(true);
                 } else {
                     onDlq(false);