Merge branch '2.14' into 2.15

cowtowncoder · cowtowncoder · commit 37118b676704 · 2022-11-29T19:56:38.000-08:00
diff --git a/src/test/java/com/fasterxml/jackson/databind/MapperFootprintTest.java b/src/test/java/com/fasterxml/jackson/databind/MapperFootprintTest.java
@@ -26,9 +26,12 @@ public void testMapperFootprint() throws InterruptedException {
         GraphLayout mapperLayout = mapperLayoutA.totalSize() > mapperLayoutB.totalSize() ?
                 mapperLayoutB : mapperLayoutA;
 
+        // 29-Nov-2022, tatu: Should be under 10k, but... flakiness.
         final int maxByteSize = 20_000;
         Assert.assertTrue(
-                "ObjectMapper memory footprint exceeded limit ("+maxByteSize+"). Footprint details: " + mapperLayout.toFootprint(),
+                "ObjectMapper memory footprint ("+mapperLayout.totalSize()
+                +") exceeded limit ("+maxByteSize
+                +"). Footprint details: " + mapperLayout.toFootprint(),
                 mapperLayout.totalSize() < maxByteSize);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -26,9 +26,12 @@ public void testMapperFootprint() throws InterruptedException {`
`26`	`26`	`GraphLayout mapperLayout = mapperLayoutA.totalSize() > mapperLayoutB.totalSize() ?`
`27`	`27`	`mapperLayoutB : mapperLayoutA;`
`28`	`28`
	`29`	`+ // 29-Nov-2022, tatu: Should be under 10k, but... flakiness.`
`29`	`30`	`final int maxByteSize = 20_000;`
`30`	`31`	`Assert.assertTrue(`
`31`		`- "ObjectMapper memory footprint exceeded limit ("+maxByteSize+"). Footprint details: " + mapperLayout.toFootprint(),`
	`32`	`+ "ObjectMapper memory footprint ("+mapperLayout.totalSize()`
	`33`	`+ +") exceeded limit ("+maxByteSize`
	`34`	`+ +"). Footprint details: " + mapperLayout.toFootprint(),`
`32`	`35`	`mapperLayout.totalSize() < maxByteSize);`
`33`	`36`	`}`
`34`	`37`	`}`