Changeset 13224 in josm for trunk/src/org

Timestamp:

2017-12-18T16:16:50+01:00 (7 years ago)

Author:

Don-vip

Message:

fix #15678 - StringIndexOutOfBoundsException in OsmPrimitiveComparator

File:

• trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitiveComparator.java (modified) (1 diff)

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

@@ -25 +25 @@
      */
     public static Comparator<OsmPrimitive> comparingNames() {
-        final Comparator<String> digitsLast = comparing(str -> Character.isDigit(str.charAt(0)) ? 1 : 0);
+        final Comparator<String> digitsLast = comparing(str -> !str.isEmpty() && Character.isDigit(str.charAt(0)) ? 1 : 0);
         return comparing(memoize(DefaultNameFormatter.getInstance()::format),
                 digitsLast.thenComparing(AlphanumComparator.getInstance()));