Changeset 5996 in josm for trunk/src

Timestamp:

2013-06-08T12:51:41+02:00 (11 years ago)

Author:

Don-vip

Message:

fix #8771 - <changeset> with no ID rejected

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/Changeset.java (modified) (1 diff)
• io/OsmReader.java (modified) (1 diff)

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

@@ -48 +48 @@
      */
     public Changeset() {
-        this.id = 0;
-        this.tags = new HashMap<String, String>();
+        this(0);
     }
 

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

@@ -320 +320 @@
 
     private void parseChangeset(Long uploadChangesetId) throws XMLStreamException {
-        long id = getLong("id");
-
-        if (id == uploadChangesetId) {
-            uploadChangeset = new Changeset((int) getLong("id"));
+
+        Long id = null;
+        if (parser.getAttributeValue(null, "id") != null) {
+            id = getLong("id");
+        }
+        // Read changeset info if neither upload-changeset nor id are set, or if they are both set to the same value
+        if (id == uploadChangesetId || (id != null && id.equals(uploadChangesetId))) {
+            uploadChangeset = new Changeset(id != null ? id.intValue() : 0);
             while (true) {
                 int event = parser.next();