Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '6.1.x'

Browse Source
This commit is contained in:
Simon Baslé
2024-09-17 16:42:09 +02:00
parent 20bc5ef68b de4ff4b44b
commit 06d240b558
2 changed files with 31 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
spring-core/src/main/java/org/springframework/core/ReactiveAdapterRegistry.java
View File

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

25
spring-core/src/test/java/org/springframework/core/SpringCoreBlockHoundIntegrationTests.java
View File

@@ -66,7 +66,7 @@ class SpringCoreBlockHoundIntegrationTests {
} }
@Test @Test
void concurrentReferenceHashMap() { void concurrentReferenceHashMapSegmentDoTask() {
int size = 10000; int size = 10000;
Map<String, String> map = new ConcurrentReferenceHashMap<>(size); Map<String, String> map = new ConcurrentReferenceHashMap<>(size);
@@ -88,6 +88,29 @@ class SpringCoreBlockHoundIntegrationTests {
assertThat(map).hasSize(size); assertThat(map).hasSize(size);
} }
@Test
void concurrentReferenceHashMapSegmentClear() {
int size = 10000;
Map<String, String> map = new ConcurrentReferenceHashMap<>(size);
CompletableFuture<Object> future1 = new CompletableFuture<>();
testNonBlockingTask(() -> {
for (int i = 0; i < size / 2; i++) {
map.put("a" + i, "bar");
}
}, future1);
CompletableFuture<Object> future2 = new CompletableFuture<>();
testNonBlockingTask(() -> {
for (int i = 0; i < size; i++) {
map.clear();
}
}, future2);
CompletableFuture.allOf(future1, future2).join();
assertThat(map).isEmpty();
}
private void testNonBlockingTask(NonBlockingTask task) { private void testNonBlockingTask(NonBlockingTask task) {
CompletableFuture<Object> future = new CompletableFuture<>(); CompletableFuture<Object> future = new CompletableFuture<>();
testNonBlockingTask(task, future); testNonBlockingTask(task, future);