Changeset 3217 in josm for trunk/src/org/openstreetmap/josm/io/OsmReader.java

Timestamp:

2010-05-05T19:10:04+02:00 (14 years ago)

Author:

bastiK

Message:

fixed #4971 NullPointerException at OsmReader.java:586, caused by NullPointerException at Storage.java:317;
fixed #4964 exception undo "node-merge" with nodes children of relations.

File:

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

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

@@ -271 +271 @@
                 String key = atts.getValue("k");
                 String value = atts.getValue("v");
+                if (key == null || value == null) {
+                    throwException(tr("Missing key or value attribute in tag."));
+                }
                 currentPrimitive.put(intern(key), intern(value));