Changeset 9480 in josm

Timestamp:

2016-01-16T03:00:56+01:00 (9 years ago)

Author:

Don-vip

Message:

fix #12376 - Multipolygon test hangs (patch by cmuelle8), regression from r9351

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/osm/MultipolygonBuilder.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/data/osm/MultipolygonBuilderTest.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/osm/MultipolygonBuilder.java

@@ -376 +376 @@
         @Override
         protected List<PolygonLevel> compute() {
-            if (to - from < directExecutionTaskSize) {
+            if (to - from <= directExecutionTaskSize) {
                 return computeDirectly();
             } else {
                 final Collection<ForkJoinTask<List<PolygonLevel>>> tasks = new ArrayList<>();
                 for (int fromIndex = from; fromIndex < to; fromIndex += directExecutionTaskSize) {
-                    final List<PolygonLevel> output = new ArrayList<>();
-                    tasks.add(new Worker(input, fromIndex, Math.min(fromIndex + directExecutionTaskSize, to), output, directExecutionTaskSize));
-                }
-                for (ForkJoinTask<List<PolygonLevel>> task : tasks) {
-                    output.addAll(task.join());
+                    tasks.add(new Worker(input, fromIndex, Math.min(fromIndex + directExecutionTaskSize, to), new ArrayList<PolygonLevel>(), directExecutionTaskSize));
+                }
+                for (ForkJoinTask<List<PolygonLevel>> task : ForkJoinTask.invokeAll(tasks)) {
+                    List<PolygonLevel> res = task.join();
+                    if (res == null) {
+                        return null;
+                    }
+                    output.addAll(res);
                 }
                 return output;

trunk/test/unit/org/openstreetmap/josm/data/osm/MultipolygonBuilderTest.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.data.osm;
+
+import static org.junit.Assert.assertNull;
 
 import java.io.FileInputStream;
@@ -42 +44 @@
             DataSet ds = OsmReader.parseDataSet(Compression.BZIP2.getUncompressedInputStream(is), null);
             for (Relation r : ds.getRelations()) {
-                new MultipolygonBuilder().makeFromWays(r.getMemberPrimitives(Way.class));
+                assertNull(new MultipolygonBuilder().makeFromWays(r.getMemberPrimitives(Way.class)));
             }
         }