Changeset 14314 in josm for trunk

Timestamp:

2018-10-12T22:24:27+02:00 (6 years ago)

Author:

Don-vip

Message:

fix #16834 - IAE when opening .osmc containing empty note created by OsmAnd

Location:

trunk

Files:

• src/org/openstreetmap/josm/io/OsmChangeReader.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/io/OsmChangeReaderTest.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/io/OsmChangeReader.java

@@ -122 +122 @@
             }
         }
-        if (location != null && text != null) {
+        if (location != null && text != null && !text.isEmpty()) {
             noteData.createNote(location, text);
         }

trunk/test/unit/org/openstreetmap/josm/io/OsmChangeReaderTest.java

@@ -63 +63 @@
                 "      <comment text=\"something else\" />\r\n" +
                 "    </note>\r\n" +
+                "    <note lat=\"50.75\" lon=\"13.75\" id=\"-4\">\r\n" +
+                "      <comment text=\"\" />\r\n" +
+                "    </note>\r\n" +
                 "  </create>\r\n" +
                 "  <modify />\r\n" +