Changeset 13513 in josm for trunk/src

Timestamp:

2018-03-11T14:21:34+01:00 (6 years ago)

Author:

Don-vip

Message:

fix #16078 - avoid NPE in PurgeCommand with null relations

File:

• trunk/src/org/openstreetmap/josm/command/PurgeCommand.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/command/PurgeCommand.java

@@ -160 +160 @@
     public static List<OsmPrimitive> topoSort(Collection<OsmPrimitive> sel) {
         Set<OsmPrimitive> in = new HashSet<>(sel);
-
         List<OsmPrimitive> out = new ArrayList<>(in.size());
+        Set<Relation> inR = new HashSet<>();
 
         // Nodes not deleted in the first pass
@@ -201 +201 @@
                 }
                 out.add(w);
+            } else if (u instanceof Relation) {
+                inR.add((Relation) u);
             }
         }
@@ -207 +209 @@
             throw new AssertionError("topo sort algorithm failed (nodes remaining)");
 
-        /**
-          * Rest are relations. Do topological sorting on a DAG where each
-          * arrow points from child to parent. (Because it is faster to
-          * loop over getReferrers() than getMembers().)
-          */
-        @SuppressWarnings({ "unchecked", "rawtypes" })
-        Set<Relation> inR = (Set) in;
+        // Do topological sorting on a DAG where each arrow points from child to parent.
+        //  (Because it is faster to loop over getReferrers() than getMembers().)
 
         Map<Relation, Integer> numChilds = new HashMap<>();