mirror/Spark
3
0
Fork 0
mirror of https://github.com/igniterealtime/Spark.git synced 2025-10-29 03:34:43 +00:00
Code Issues Projects Releases Wiki Activity

SPARK-2352: BookmarkPlugin.setBookmarks(): avoid NPE on null names

Browse Source
This commit is contained in:
Sergey Ponomarev 2025-07-20 12:46:13 +03:00 committed by Guus der Kinderen
parent 7a7ba03249
commit 629353c6e2
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/main/java/org/jivesoftware/sparkimpl/plugin/bookmarks/BookmarkPlugin.java
View File

@ -154,9 +154,11 @@ public class BookmarkPlugin implements Plugin {
if (manager != null) {
final List<BookmarkedConference> bookmarkedConferences = manager.getBookmarkedConferences()
.stream().sorted(Comparator.comparing(BookmarkedConference::getName)).collect(Collectors.toList());;
.stream().sorted(Comparator.comparing(BookmarkedConference::getName, Comparator.nullsFirst(Comparator.naturalOrder())))
.collect(Collectors.toList());
final List<BookmarkedURL> bookmarkedLinks = manager.getBookmarkedURLs()
.stream().sorted(Comparator.comparing(BookmarkedURL::getName)).collect(Collectors.toList());
.stream().sorted(Comparator.comparing(BookmarkedURL::getName, Comparator.nullsFirst(Comparator.naturalOrder())))
.collect(Collectors.toList());
for (BookmarkedURL bookmarkedLink : bookmarkedLinks) {
final BookmarkedURL link = bookmarkedLink;