Changeset 36009 in osm for applications/editors

Timestamp:

2022-07-18T15:21:16+02:00 (2 years ago)

Author:

taylor.smock

Message:

Fix #22223: IAE in org.openstreetmap.josm.plugins.turnrestrictions.list.TurnRestrictionsListDialog$DeleteAction.deleteRelation

This also fixes a similar IAE in TurnRestrictgionEditor.

Location:

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions

Files:

• editor/TurnRestrictionEditor.java (modified) (1 diff)
• list/TurnRestrictionsListDialog.java (modified) (1 diff)

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java

@@ -769 +769 @@
         public void actionPerformed(ActionEvent e) {
             Relation tr = getTurnRestriction();
-            if (tr == null || tr.getDataSet() == null) return;
+            if (tr == null || tr.getDataSet() == null || tr.isDeleted()) return;
             org.openstreetmap.josm.actions.mapmode.DeleteAction.deleteRelation(
                     getLayer(),

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java

@@ -270 +270 @@
 
         protected void deleteRelation(Relation toDelete) {
-            if (toDelete == null)
+            if (toDelete == null || toDelete.getDataSet() == null || toDelete.isDeleted())
                 return;
             org.openstreetmap.josm.actions.mapmode.DeleteAction.deleteRelation(