Changeset 31072 in osm for applications/editors/josm/plugins

Timestamp:

2015-04-01T00:05:30+02:00 (10 years ago)

Author:

donvip

Message:

[josm_utilsplugin2] fix #josm11281 - NPE

File:

• applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/replacegeometry/ReplaceGeometryUtils.java (modified) (1 diff)

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/replacegeometry/ReplaceGeometryUtils.java

@@ -117 +117 @@
         // FIXME: handle different layers
         List<Command> commands = new ArrayList<>();
-        commands.add(MergeNodesAction.mergeNodes(Main.main.getEditLayer(), Arrays.asList(subjectNode, referenceNode), referenceNode));
+        Command c = MergeNodesAction.mergeNodes(Main.main.getEditLayer(), Arrays.asList(subjectNode, referenceNode), referenceNode);
+        if (c == null) {
+            // User canceled
+            return null;
+        }
+        commands.add(c);
 
         return new ReplaceGeometryCommand(