Changeset 17855 in josm for trunk/src/org

Timestamp:

2021-05-02T10:05:54+02:00 (4 years ago)

Author:

simon04

Message:

see #20824 - Fix NPE found by Coverity Scan

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/notes/Note.java (modified) (3 diffs)
• gui/dialogs/NotesDialog.java (modified) (2 diffs)

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

@@ -11 +11 @@
 
 import org.openstreetmap.josm.data.coor.LatLon;
+
+import javax.annotation.Nullable;
 
 /**
@@ -159 +161 @@
      * @since 11821
      */
+    @Nullable
     public NoteComment getLastComment() {
         return comments.isEmpty() ? null : comments.get(comments.size()-1);
@@ -175 +178 @@
      * @return First comment object
      */
+    @Nullable
     public NoteComment getFirstComment() {
         return comments.isEmpty() ? null : comments.get(0);
     }
 
+    @Nullable
     private String getUserName() {
         return getFirstComment() == null ? null : getFirstComment().getUser().getName();

trunk/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java

@@ -248 +248 @@
         }
         return Pattern.compile("\\s+").splitAsStream(filter).allMatch(string -> {
+            NoteComment lastComment = note.getLastComment();
             switch (string) {
                 case "open":
@@ -254 +255 @@
                     return note.getState() == State.CLOSED;
                 case "reopened":
-                    return note.getLastComment().getNoteAction() == NoteComment.Action.REOPENED;
+                    return lastComment != null && lastComment.getNoteAction() == NoteComment.Action.REOPENED;
                 case "new":
                     return note.getId() < 0;
                 case "modified":
-                    return note.getLastComment().isNew();
+                    return lastComment != null && lastComment.isNew();
                 default:
                     return note.getComments().toString().contains(string);