Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ARTEMIS-2797 Fixing user update Null 

UpdateQueueTest::testUpdateQueueWithFilter was broken.
This commit is contained in:
Clebert Suconic 2020-06-29 22:57:13 -04:00
parent 3d746d3b23
commit 562bb965ae
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/PostOfficeImpl.java
View File

@ -720,15 +720,12 @@ public class PostOfficeImpl implements PostOffice, NotificationListener, Binding
queue.setConfigurationManaged(queueConfiguration.isConfigurationManaged()); queue.setConfigurationManaged(queueConfiguration.isConfigurationManaged());
changed = true; changed = true;
} }
/* Why is this?
if (logger.isDebugEnabled()) { if (logger.isDebugEnabled()) {
if (queueConfiguration.getUser() == null && queue.getUser() != null) { if (queueConfiguration.getUser() == null && queue.getUser() != null) {
logger.debug("Ignoring updating Queue to a NULL user"); logger.debug("Ignoring updating Queue to a NULL user");
} }
} }
*/ if (queueConfiguration.getUser() != null && !queueConfiguration.getUser().equals(queue.getUser())) {
// user
if (!Objects.equals(queue.getUser(), queueConfiguration.getUser())) {
changed = true; changed = true;
queue.setUser(queueConfiguration.getUser()); queue.setUser(queueConfiguration.getUser());
} }