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

fix timer issues

Browse Source 
sync reactor-core
This commit is contained in:
Stephane Maldini
2016-01-28 18:57:28 +00:00
parent 28dcf2e78f
commit 9204fdc371
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-web-reactive/src/main/java/org/springframework/http/server/reactive/UndertowHttpHandlerAdapter.java
View File

@@ -131,7 +131,7 @@ public class UndertowHttpHandlerAdapter implements io.undertow.server.HttpHandle
@Override @Override
public void subscribe(Subscriber<? super DataBuffer> subscriber) { public void subscribe(Subscriber<? super DataBuffer> subscriber) {
if (subscriber == null) { if (subscriber == null) {
throw Exceptions.spec_2_13_exception(); throw Exceptions.argumentIsNullException();
} }
if (this.subscriber != null) { if (this.subscriber != null) {
subscriber.onError(new IllegalStateException("Only one subscriber allowed")); subscriber.onError(new IllegalStateException("Only one subscriber allowed"));

1
spring-web-reactive/src/test/java/org/springframework/http/server/reactive/AsyncIntegrationTests.java
View File

@@ -27,6 +27,7 @@ import org.junit.runners.Parameterized;
import reactor.core.publisher.Mono; import reactor.core.publisher.Mono;
import reactor.core.publisher.ProcessorGroup; import reactor.core.publisher.ProcessorGroup;
import reactor.core.publisher.Processors; import reactor.core.publisher.Processors;
import reactor.core.timer.Timer;
import reactor.rx.Stream; import reactor.rx.Stream;
import org.springframework.core.io.buffer.DataBufferAllocator; import org.springframework.core.io.buffer.DataBufferAllocator;