Changeset 18327 in josm

Timestamp:

2021-12-02T09:54:09+01:00 (3 years ago)

Author:

GerdP

Message:

fix #21550: NPE in org.openstreetmap.josm.gui.tagging.presets.items.PresetListEntry.getCount

• add null check (patch by taylor.smock)

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/tagging/presets/items/PresetListEntry.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/gui/tagging/presets/items/PresetListEntryTest.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/PresetListEntry.java

@@ -189 +189 @@
      */
     public int getCount() {
-        Integer count = cms == null ? null : cms.usage.map.get(value);
+        Integer count = cms == null || cms.usage == null ? null : cms.usage.map.get(value);
         return count == null ? 0 : count;
     }

trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/PresetListEntryTest.java

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.tagging.presets.items;
 
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
@@ -28 +29 @@
         assertTrue(new PresetListEntry("", null).getListDisplay(200).contains(" "));
     }
+
+    /**
+     * Non-regression test for ticket <a href="https://josm.openstreetmap.de/ticket/21550">#21550</a>
+     */
+    @Test
+    void testTicket21550() {
+        final PresetListEntry entry = new PresetListEntry("", new Combo());
+        assertDoesNotThrow(entry::getCount);
+    }
 }