Changeset 13100 in josm for trunk

Timestamp:

2017-11-08T22:58:48+01:00 (6 years ago)

Author:

Don-vip

Message:

see #15534 - ensure user names are never null, as expected

File:

• trunk/src/org/openstreetmap/josm/data/osm/User.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/osm/User.java

@@ -159 +159 @@
      *
      * @param name User name
+     * @throws NullPointerException if name is null
      */
     public void addName(String name) {
-        names.add(name);
+        names.add(Objects.requireNonNull(name, "name"));
     }
 
@@ -170 +171 @@
      * data files it is unclear which is the up-to-date user name.
      * @param name the preferred user name to set
+     * @throws NullPointerException if name is null
      */
     public void setPreferredName(String name) {
@@ -177 +179 @@
         final Collection<String> allNames = new LinkedHashSet<>(names);
         names.clear();
-        names.add(name);
+        names.add(Objects.requireNonNull(name, "name"));
         names.addAll(allNames);
     }