Changeset 7989 in josm

Timestamp:

2015-01-27T21:33:31+01:00 (10 years ago)

Author:

Don-vip

Message:

fix #11026 - NPE when joining areas (regression from r7987)

File:

• trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java

@@ -463 +463 @@
 
         try {
+            // see #11026 - Because <ways> is a dynamic filtered (on ways) of a filtered (on selected objects) collection,
+            // retrieve effective dataset before joining the ways (which affects the selection, thus, the <ways> collection)
+            // Dataset retrieving allows to call this code without relying on Main.getCurrentDataSet(), thus, on a mapview instance
+            DataSet ds = ways.iterator().next().getDataSet();
+
+            // Do the job of joining areas
             JoinAreasResult result = joinAreas(areas);
 
@@ -478 +484 @@
                     allWays.addAll(pol.innerWays);
                 }
-                DataSet ds = ways.iterator().next().getDataSet();
                 if (ds != null) {
                     ds.setSelected(allWays);