From commits-return-43692-archive-asf-public=cust-asf.ponee.io@qpid.apache.org Mon Feb 5 15:36:11 2018 Return-Path: X-Original-To: archive-asf-public@eu.ponee.io Delivered-To: archive-asf-public@eu.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by mx-eu-01.ponee.io (Postfix) with ESMTP id 7F7DF180647 for ; Mon, 5 Feb 2018 15:36:11 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 6F9EF160C4B; Mon, 5 Feb 2018 14:36:11 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id B80B5160C46 for ; Mon, 5 Feb 2018 15:36:10 +0100 (CET) Received: (qmail 69182 invoked by uid 500); 5 Feb 2018 14:36:04 -0000 Mailing-List: contact commits-help@qpid.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@qpid.apache.org Delivered-To: mailing list commits@qpid.apache.org Received: (qmail 69173 invoked by uid 99); 5 Feb 2018 14:36:04 -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, 05 Feb 2018 14:36:04 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id CD2E4DFB31; Mon, 5 Feb 2018 14:36:04 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: kwall@apache.org To: commits@qpid.apache.org Message-Id: <8b156624e5ff4d95bb895e5f801ad811@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: qpid-broker-j git commit: QPID-8096: [Broker-J] Fix defect that prevent a PUT preference end with NullPointerException Date: Mon, 5 Feb 2018 14:36:04 +0000 (UTC) Repository: qpid-broker-j Updated Branches: refs/heads/master bd1f90985 -> dfebfa23b QPID-8096: [Broker-J] Fix defect that prevent a PUT preference end with NullPointerException Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/dfebfa23 Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/dfebfa23 Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/dfebfa23 Branch: refs/heads/master Commit: dfebfa23ba4ac30cecc8d1ac74819449b650f248 Parents: bd1f909 Author: Keith Wall Authored: Mon Feb 5 14:35:40 2018 +0000 Committer: Keith Wall Committed: Mon Feb 5 14:35:40 2018 +0000 ---------------------------------------------------------------------- .../qpid/server/model/preferences/UserPreferencesImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/dfebfa23/broker-core/src/main/java/org/apache/qpid/server/model/preferences/UserPreferencesImpl.java ---------------------------------------------------------------------- diff --git a/broker-core/src/main/java/org/apache/qpid/server/model/preferences/UserPreferencesImpl.java b/broker-core/src/main/java/org/apache/qpid/server/model/preferences/UserPreferencesImpl.java index 2acedb3..cb907aa 100644 --- a/broker-core/src/main/java/org/apache/qpid/server/model/preferences/UserPreferencesImpl.java +++ b/broker-core/src/main/java/org/apache/qpid/server/model/preferences/UserPreferencesImpl.java @@ -277,9 +277,9 @@ public class UserPreferencesImpl implements UserPreferences } } - _preferenceStore.replace(Collections.singleton(existingPreferenceId), + _preferenceStore.replace(existingPreferenceId != null ? Collections.singleton(existingPreferenceId) : Collections.emptyList(), augmentedPreference == null - ? Collections.emptyList() + ? Collections.emptyList() : Collections.singleton(PreferenceRecordImpl.fromPreference(augmentedPreference))); if (existingPreferenceId != null) --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org For additional commands, e-mail: commits-help@qpid.apache.org