Merge branch '6.1.x'

This commit is contained in:
Simon Baslé
2024-09-17 16:42:09 +02:00
2 changed files with 31 additions and 5 deletions

View File

@@ -441,10 +441,13 @@ public class ReactiveAdapterRegistry {
public void applyTo(BlockHound.Builder builder) {
// Avoid hard references potentially anywhere in spring-core (no need for structural dependency)
String className = "org.springframework.util.ConcurrentReferenceHashMap$Segment";
builder.allowBlockingCallsInside(className, "doTask");
builder.allowBlockingCallsInside(className, "clear");
builder.allowBlockingCallsInside(className, "restructure");
String segmentClassName = "org.springframework.util.ConcurrentReferenceHashMap$Segment";
builder.allowBlockingCallsInside(segmentClassName, "doTask");
builder.allowBlockingCallsInside(segmentClassName, "clear");
builder.allowBlockingCallsInside(segmentClassName, "restructure");
String referenceManagerClassName = "org.springframework.util.ConcurrentReferenceHashMap$ReferenceManager";
builder.allowBlockingCallsInside(referenceManagerClassName, "pollForPurge");
}
}