Changeset 30726 in osm for applications

Timestamp:

2014-10-16T20:31:07+02:00 (10 years ago)

Author:

donvip

Message:

[josm_pbf] fix #josm10641 - NPE when saving large dataset

File:

• applications/editors/josm/plugins/pbf/src/org/openstreetmap/josm/plugins/pbf/io/PbfWriter.java (modified) (5 diffs)

applications/editors/josm/plugins/pbf/src/org/openstreetmap/josm/plugins/pbf/io/PbfWriter.java

@@ -350 +350 @@
             }
 
-            public void processNodes(Collection<Node> node) {
+            public void processNode(Node node) {
                 if (nodes == null) {
                     writeEmptyHeaderIfNeeded();
@@ -356 +356 @@
                     nodes = new NodeGroup();
                 }
-                for (Node n : node) {
-                    if (n.getCoor() != null) {
-                        nodes.add(n);
-                        checkLimit();
-                    }
-                }
-            }
-
-            public void processWays(Collection<Way> way) {
+                if (node.getCoor() != null) {
+                    nodes.add(node);
+                    checkLimit();
+                }
+            }
+
+            public void processWay(Way way) {
                 if (ways == null) {
                     writeEmptyHeaderIfNeeded();
@@ -370 +368 @@
                     ways = new WayGroup();
                 }
-                for (Way w : way) {
-                    ways.add(w);
-                    checkLimit();
-                }
-            }
-
-            public void processRelations(Collection<Relation> relation) {
+                ways.add(way);
+                checkLimit();
+            }
+
+            public void processRelation(Relation relation) {
                 if (relations == null) {
                     writeEmptyHeaderIfNeeded();
@@ -382 +378 @@
                     relations = new RelationGroup();
                 }
-                for (Relation r : relation) {
-                    relations.add(r);
-                    checkLimit();
-                }
+                relations.add(relation);
+                checkLimit();
             }
         }
@@ -455 +449 @@
         public void process(DataSet ds) {
             processor.processSources(ds.dataSources);
-            processor.processNodes(ds.getNodes());
-            processor.processWays(ds.getWays());
-            processor.processRelations(ds.getRelations());
+            for (Node n : ds.getNodes()) {
+                processor.processNode(n);
+            }
+            for (Way w : ds.getWays()) {
+                processor.processWay(w);
+            }
+            for (Relation r : ds.getRelations()) {
+                processor.processRelation(r);
+            }
         }