qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kw...@apache.org
Subject qpid-broker-j git commit: QPID-8096: [Broker-J] Fix defect that prevent a PUT preference end with NullPointerException
Date Mon, 05 Feb 2018 14:36:04 GMT
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 <kwall@apache.org>
Authored: Mon Feb 5 14:35:40 2018 +0000
Committer: Keith Wall <kwall@apache.org>
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.<PreferenceRecord>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


Mime
View raw message