From commits-return-53460-archive-asf-public=cust-asf.ponee.io@activemq.apache.org Mon Oct 1 20:05:16 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 772AE180677 for ; Mon, 1 Oct 2018 20:05:15 +0200 (CEST) Received: (qmail 21494 invoked by uid 500); 1 Oct 2018 18:05:14 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 21476 invoked by uid 99); 1 Oct 2018 18:05:14 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Oct 2018 18:05:14 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 0D1D1E0893; Mon, 1 Oct 2018 18:05:14 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: jbertram@apache.org To: commits@activemq.apache.org Date: Mon, 01 Oct 2018 18:05:16 -0000 Message-Id: <079f5370520a4077817fb091852f6455@git.apache.org> In-Reply-To: <9086bd833c7f493aac5a06ad4559be0a@git.apache.org> References: <9086bd833c7f493aac5a06ad4559be0a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/4] activemq-artemis git commit: ARTEMIS-1951 allow queue's user to be updated ARTEMIS-1951 allow queue's user to be updated Fix so that it only updates if not null, to avoid user being unset from existing api's, This is similar to other values, that only change the value when not null. (cherry picked from commit c7c23454e810c6d32593dd4f18feb05eebfdaad3) Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/20b746ec Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/20b746ec Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/20b746ec Branch: refs/heads/2.6.x Commit: 20b746ec28b3c54f98ac302566629a0364446851 Parents: dcd88b2 Author: Michael André Pearce Authored: Mon Jun 25 13:55:16 2018 +0100 Committer: Justin Bertram Committed: Mon Oct 1 13:03:52 2018 -0500 ---------------------------------------------------------------------- .../activemq/artemis/core/postoffice/impl/PostOfficeImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/20b746ec/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/PostOfficeImpl.java ---------------------------------------------------------------------- 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 6a3dd28..ee017dd 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 @@ -512,7 +512,7 @@ public class PostOfficeImpl implements PostOffice, NotificationListener, Binding changed = true; queue.setExclusive(exclusive); } - if ((user != null && !user.equals(queue.getUser()) || (user == null && queue.getUser() != null))) { + if (user != null && !user.equals(queue.getUser())) { changed = true; queue.setUser(user); }