From 629353c6e2eede868e74ca51261b55e7ab611b70 Mon Sep 17 00:00:00 2001
From: Sergey Ponomarev <stokito@gmail.com>
Date: Sun, 20 Jul 2025 12:46:13 +0300
Subject: [PATCH] SPARK-2352: BookmarkPlugin.setBookmarks(): avoid NPE on null
 names

---
 .../sparkimpl/plugin/bookmarks/BookmarkPlugin.java          | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/org/jivesoftware/sparkimpl/plugin/bookmarks/BookmarkPlugin.java b/core/src/main/java/org/jivesoftware/sparkimpl/plugin/bookmarks/BookmarkPlugin.java
index 7df590e3..cfcf1c82 100644
--- a/core/src/main/java/org/jivesoftware/sparkimpl/plugin/bookmarks/BookmarkPlugin.java
+++ b/core/src/main/java/org/jivesoftware/sparkimpl/plugin/bookmarks/BookmarkPlugin.java
@@ -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;