Changeset 35082 in osm for applications/editors/josm

Timestamp:

2019-08-11T14:00:33+02:00 (5 years ago)

Author:

upliner

Message:

Reverter: fix possible NPE

Location:

applications/editors/josm/plugins/reverter

Files:

• build.xml (modified) (1 diff)
• src/reverter/MultiOsmReader.java (modified) (3 diffs)

applications/editors/josm/plugins/reverter/build.xml

@@ -2 +2 @@
 <project name="reverter" default="dist" basedir=".">
     <!-- enter the SVN commit message -->
-    <property name="commit.message" value="Reverter: fix #josm16508 use mulit-fetch API for objects history"/>
+    <property name="commit.message" value="Reverter: fix possible NPE"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
     <property name="plugin.main.version" value="14946"/>

applications/editors/josm/plugins/reverter/src/reverter/MultiOsmReader.java

@@ -44 +44 @@
     protected Node parseNode() throws XMLStreamException  {
         Node node = super.parseNode();
-        if (callback != null) {
-            callback.primitiveParsed(node.getPrimitiveId());
+        if (callback != null && node != null) {
+            callback.primitiveParsed(node);
         }
         return node;
@@ -52 +52 @@
     protected Way parseWay() throws XMLStreamException  {
         Way way = super.parseWay();
-        if (callback != null) {
-            callback.primitiveParsed(way.getPrimitiveId());
+        if (callback != null && way != null) {
+            callback.primitiveParsed(way);
         }
         return way;
@@ -60 +60 @@
     protected Relation parseRelation() throws XMLStreamException  {
         Relation relation = super.parseRelation();
-        if (callback != null) {
-            callback.primitiveParsed(relation.getPrimitiveId());
+        if (callback != null && relation != null) {
+            callback.primitiveParsed(relation);
         }
         return relation;