Changeset 4389 in josm for trunk/src/org/openstreetmap/josm/io

Timestamp:

2011-08-31T21:23:59+02:00 (13 years ago)

Author:

bastiK

Message:

don't throw NPE when there is <changeset> object with <tag> elements at the top of the file (see #6742)

File:

• trunk/src/org/openstreetmap/josm/io/OsmReader.java (modified) (1 diff)

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

@@ -268 +268 @@
                         throwException(tr("Missing key or value attribute in tag."));
                     }
-                    currentPrimitive.put(key.intern(), value.intern());
-
+                    if (currentPrimitive != null) {
+                        currentPrimitive.put(key.intern(), value.intern());
+                    }
                 } else {
                     System.out.println(tr("Undefined element ''{0}'' found in input stream. Skipping.", qName));