Changeset 19247 in josm

Timestamp:

2024-10-21T22:45:38+02:00 (4 weeks ago)

Author:

taylor.smock

Message:

Fix #23950: Fix a StackOverflowError that occurs when a self-referencing relation exists

Also disable StyledTiledMapRendererTest in CI for now.

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/data/osm/visitor/paint/StyledTiledMapRendererTest.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/gui/layer/OsmDataLayerTest.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

@@ -1290 +1290 @@
         } else if (p instanceof IRelation<?>) {
             for (IPrimitive member : ((IRelation<?>) p).getMemberPrimitivesList()) {
-                resetTiles(member);
+                if (member instanceof IRelation) {
+                    resetBounds(member.getBBox()); // Avoid recursive relation issues
+                    break;
+                } else {
+                    resetTiles(member);
+                }
             }
         } else {

trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/paint/StyledTiledMapRendererTest.java

@@ -20 +20 @@
 import org.apache.commons.jcs3.access.CacheAccess;
 import org.awaitility.Awaitility;
+import org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
@@ -38 +39 @@
  * Test class for {@link StyledTiledMapRenderer}
  */
+@DisabledIfEnvironmentVariable(disabledReason = "Needs more work; leave enabled locally but disable on CI", named = "CI", matches = "true")
 @Main
 @Projection

trunk/test/unit/org/openstreetmap/josm/gui/layer/OsmDataLayerTest.java

@@ -29 +29 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.gui.MainApplication;
@@ -335 +336 @@
         assertTrue(Logging.getLastErrorAndWarnings().stream().noneMatch(s -> s.contains("UnsupportedFlavorException")));
     }
+
+    /**
+     * Non-regression test for #23950
+     */
+    @Test
+    void testTicket23950() {
+        final Relation first = TestUtils.newRelation("", new RelationMember("", TestUtils.newNode("")));
+        final DataSet ds = new DataSet();
+        // This is needed to cause the condition
+        MainApplication.getLayerManager().addLayer(new OsmDataLayer(ds, "StyledTiledMapRendererTest#testRecursiveRelation", null));
+        ds.addPrimitiveRecursive(first);
+        first.addMember(new RelationMember("", first));
+        ds.setSelected(first);
+    }
+
 }