Merge #3328 into 3.6.1

reactor · Nov 29, 2023 · ac8e520 · ac8e520
2 parents c6220fc + 5b22db2
commit ac8e520
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/reactor-core/src/test/java/reactor/core/publisher/OnDiscardShouldNotLeakTest.java b/reactor-core/src/test/java/reactor/core/publisher/OnDiscardShouldNotLeakTest.java
@@ -184,7 +184,6 @@ public class OnDiscardShouldNotLeakTest {
 			                                               .doOnSuccess(l -> l.forEach(Tracked::safeRelease))
 			                                               .thenReturn(Tracked.RELEASED)),
 			DiscardScenario.fluxSource("collectList", f -> f.collectList()
-			                                                   .doOnSuccess(l -> l.forEach(Tracked::safeRelease))
 			                                                   .thenReturn(Tracked.RELEASED)),
 			DiscardScenario.fluxSource("streamCollector", f -> f.collect(Collectors.toList())
 			                                               .doOnSuccess(l -> l.forEach(Tracked::safeRelease))

diff --git a/reactor-core/src/test/java/reactor/test/MemoryUtils.java b/reactor-core/src/test/java/reactor/test/MemoryUtils.java
@@ -186,6 +186,12 @@ public static void safeRelease(Object t) {
 			}
 	        else if (t instanceof Tracked) {
 	            ((Tracked) t).release();
+	        } else if (t instanceof Collection) {
+				for (Object o : (Collection) t) {
+					if (o instanceof Tracked) {
+						((Tracked) o).release();
+					}
+				}
 	        }
 	    }