Changeset 7516 in josm for trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetReader.java

Timestamp:

2014-09-09T17:26:16+02:00 (10 years ago)

Author:

Don-vip

Message:

fix #10496 - NoSuchElementException with empty chunk in preset

File:

• trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetReader.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetReader.java

@@ -115 +115 @@
                 o = lastIdIterators.peek().next();
                 if (!lastIdIterators.peek().hasNext()) {
-                    // remove iterator is is empty
+                    // remove iterator if is empty
                     lastIdIterators.pop();
                 }
@@ -146 +146 @@
                     throw new SAXException(tr("Reference {0} is being used before it was defined", ref));
                 }
-                lastIdIterators.push(byId.get(ref).iterator());
+                Iterator<Object> it = byId.get(ref).iterator();
+                if (it.hasNext()) {
+                    lastIdIterators.push(it);
+                } else {
+                    Main.warn("Ignoring reference '"+ref+"' denoting an empty chunk");
+                }
                 continue;
             }