Changeset 17837 in josm for trunk/src/org

Timestamp:

2021-04-30T21:52:45+02:00 (3 years ago)

Author:

simon04

Message:

fix #20824 - NPE while sorting notes

Location:

trunk/src/org/openstreetmap/josm/data/notes

Files:

• Note.java (modified) (2 diffs)
• NoteComment.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/notes/Note.java

@@ -53 +53 @@
 
     /** Sorts notes by user, then creation date */
-    public static final Comparator<Note> USER_COMPARATOR = (n1, n2) -> {
-        String n1User = n1.getFirstComment().getUser().getName();
-        String n2User = n2.getFirstComment().getUser().getName();
-        return n1User.equals(n2User) ? DATE_COMPARATOR.compare(n1, n2) : n1User.compareTo(n2User);
-    };
+    public static final Comparator<Note> USER_COMPARATOR =
+            Comparator.comparing(Note::getUserName, Comparator.nullsLast(Comparator.naturalOrder())).thenComparing(DATE_COMPARATOR);
 
     /** Sorts notes by the last modified date */
-    public static final Comparator<Note> LAST_ACTION_COMPARATOR =
-            (n1, n2) -> NoteComment.DATE_COMPARATOR.compare(n1.getLastComment(), n2.getLastComment());
+    public static final Comparator<Note> LAST_ACTION_COMPARATOR = Comparator.comparing(Note::getLastComment, NoteComment.DATE_COMPARATOR);
 
     private long id;
@@ -181 +177 @@
     public NoteComment getFirstComment() {
         return comments.isEmpty() ? null : comments.get(0);
+    }
+
+    private String getUserName() {
+        return getFirstComment() == null ? null : getFirstComment().getUser().getName();
     }
 

trunk/src/org/openstreetmap/josm/data/notes/NoteComment.java

@@ -40 +40 @@
 
     /** Sorts note comments strictly by creation date */
-    public static final Comparator<NoteComment> DATE_COMPARATOR = Comparator.comparing(n -> n.commentTimestamp);
+    public static final Comparator<NoteComment> DATE_COMPARATOR = Comparator.nullsLast(Comparator.comparing(n -> n.commentTimestamp));
 
     /**