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
commit 562bb965aeb88c4be90c10e8f24ee9b7d04cc4fd Author: Clebert Suconic <[email protected]> AuthorDate: Mon Jun 29 22:57:13 2020 -0400 ARTEMIS-2797 Fixing user update Null UpdateQueueTest::testUpdateQueueWithFilter was broken. --- .../apache/activemq/artemis/core/postoffice/impl/PostOfficeImpl.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/PostOfficeImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/PostOfficeImpl.java index 9c1f56a..930f21f 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/PostOfficeImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/PostOfficeImpl.java @@ -720,15 +720,12 @@ public class PostOfficeImpl implements PostOffice, NotificationListener, Binding queue.setConfigurationManaged(queueConfiguration.isConfigurationManaged()); changed = true; } - /* Why is this? if (logger.isDebugEnabled()) { if (queueConfiguration.getUser() == null && queue.getUser() != null) { logger.debug("Ignoring updating Queue to a NULL user"); } } - */ - // user - if (!Objects.equals(queue.getUser(), queueConfiguration.getUser())) { + if (queueConfiguration.getUser() != null && !queueConfiguration.getUser().equals(queue.getUser())) { changed = true; queue.setUser(queueConfiguration.getUser()); }
