root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Switch to non-blocking thread after WebSession creation 

See gh-26958
This commit is contained in:
Rossen Stoyanchev 2021-05-24 16:27:39 +01:00
parent ffbc537835
commit de1ba79c55
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
spring-web/src/main/java/org/springframework/web/server/session/InMemoryWebSessionStore.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2019 the original author or authors. * Copyright 2002-2021 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -118,7 +118,8 @@ public class InMemoryWebSessionStore implements WebSessionStore {
this.expiredSessionChecker.checkIfNecessary(now); this.expiredSessionChecker.checkIfNecessary(now);
return Mono.<WebSession>fromSupplier(() -> new InMemoryWebSession(now)) return Mono.<WebSession>fromSupplier(() -> new InMemoryWebSession(now))
.subscribeOn(Schedulers.boundedElastic()); .subscribeOn(Schedulers.boundedElastic())
.publishOn(Schedulers.parallel());
} }
@Override @Override

11
spring-web/src/test/java/org/springframework/web/server/session/InMemoryWebSessionStoreTests.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2019 the original author or authors. * Copyright 2002-2021 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -22,9 +22,7 @@ import java.time.Instant;
import java.util.Map; import java.util.Map;
import java.util.stream.IntStream; import java.util.stream.IntStream;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import reactor.core.publisher.Mono;
import reactor.core.scheduler.Schedulers; import reactor.core.scheduler.Schedulers;
import org.springframework.beans.DirectFieldAccessor; import org.springframework.beans.DirectFieldAccessor;
@ -59,11 +57,10 @@ public class InMemoryWebSessionStoreTests {
assertThat(session.isStarted()).isTrue(); assertThat(session.isStarted()).isTrue();
} }
@Disabled // TODO: remove if/when Blockhound is enabled @Test // gh-24027, gh-26958
@Test // gh-24027
public void createSessionDoesNotBlock() { public void createSessionDoesNotBlock() {
Mono.defer(() -> this.store.createWebSession()) this.store.createWebSession()
.subscribeOn(Schedulers.parallel()) .doOnNext(session -> assertThat(Schedulers.isInNonBlockingThread()).isTrue())
.block(); .block();
} }