Changeset 36447 in osm for applications/editors

Timestamp:

2025-05-21T14:17:11+02:00 (7 months ago)

Author:

GerdP

Message:

fix #24296: NPE with Revert of reverted changeset

• add null check

File:

• applications/editors/josm/plugins/reverter/src/reverter/ChangesetReverter.java (modified) (1 diff)

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

@@ -381 +381 @@
         // Handle case where a deleted note has been restored to avoid false conflicts (fix #josm8660)
         if (currentCoor != null && historyCoor == null) {
-            LatLon previousCoor = ((Node) nds.getPrimitiveById(history.getPrimitiveId())).getCoor();
-            return previousCoor != null && previousCoor.equals(currentCoor);
+                if (nds.getPrimitiveById(history.getPrimitiveId()) != null) {
+                        LatLon previousCoor = ((Node) nds.getPrimitiveById(history.getPrimitiveId())).getCoor();
+                        return previousCoor != null && previousCoor.equals(currentCoor);
+                }
         }
         return false;