Changeset 10174 in josm for trunk/src/org/openstreetmap/josm/command

Timestamp:

2016-05-10T16:09:21+02:00 (7 years ago)

Author:

Don-vip

Message:

fix coverity 1354674, 1354675

File:

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

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

@@ -8 +8 @@
 import java.awt.GridBagLayout;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
@@ -27 +28 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.SplitWayAction;
+import org.openstreetmap.josm.actions.SplitWayAction.SplitWayResult;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -470 +472 @@
             return new ChangeCommand(ws.way, wnew);
         } else {
-            List<List<Node>> chunks = new ArrayList<>(2);
-            chunks.add(n1);
-            chunks.add(n2);
-            return SplitWayAction.splitWay(layer, ws.way, chunks, Collections.<OsmPrimitive>emptyList()).getCommand();
+            SplitWayResult split = SplitWayAction.splitWay(layer, ws.way, Arrays.asList(n1, n2), Collections.<OsmPrimitive>emptyList());
+            return split != null ? split.getCommand() : null;
         }
     }