Changeset 11261 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2016-11-16T13:04:17+01:00 (7 years ago)

Author:

simon04

Message:

fix #13985 - Freezes when creating a layer named "Data Layer "

File:

• trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

@@ -357 +357 @@
         data.addDataSetListener(MultipolygonCache.getInstance());
         DataSet.addSelectionListener(this);
-        if (name != null && name.startsWith(createLayerName(""))) {
+        if (name != null && name.startsWith(createLayerName(""))
+                && Character.isDigit((name.substring(createLayerName("").length()) + "XX" /*avoid StringIndexOutOfBoundsException*/).charAt(1))) {
             while (AlphanumComparator.getInstance().compare(createLayerName(dataLayerCounter), name) < 0) {
-                dataLayerCounter.incrementAndGet();
+                final int i = dataLayerCounter.incrementAndGet();
+                if (i > 1_000_000) {
+                    break; // to avoid looping in unforeseen case
+                }
             }
         }