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

Merge branch '5.3.x'

Browse Source
This commit is contained in:
Arjen Poutsma
2021-10-05 16:32:55 +02:00
parent c1856d24e2 c99210c01f
commit fb7eea9757
4 changed files with 74 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-web/src/main/java/org/springframework/http/codec/multipart/MultipartParser.java
View File

@@ -29,6 +29,7 @@ import org.reactivestreams.Subscription;
import reactor.core.publisher.BaseSubscriber;
import reactor.core.publisher.Flux;
import reactor.core.publisher.FluxSink;
import reactor.util.context.Context;
import org.springframework.core.codec.DecodingException;
import org.springframework.core.io.buffer.DataBuffer;
@@ -98,6 +99,11 @@ final class MultipartParser extends BaseSubscriber<DataBuffer> {
});
}
@Override
public Context currentContext() {
return this.sink.currentContext();
}
@Override
protected void hookOnSubscribe(Subscription subscription) {
requestBuffer();

6
spring-web/src/main/java/org/springframework/http/codec/multipart/PartGenerator.java
View File

@@ -42,6 +42,7 @@ import reactor.core.publisher.Flux;
import reactor.core.publisher.FluxSink;
import reactor.core.publisher.Mono;
import reactor.core.scheduler.Scheduler;
import reactor.util.context.Context;
import org.springframework.core.codec.DecodingException;
import org.springframework.core.io.buffer.DataBuffer;
@@ -113,6 +114,11 @@ final class PartGenerator extends BaseSubscriber<MultipartParser.Token> {
});
}
@Override
public Context currentContext() {
return this.sink.currentContext();
}
@Override
protected void hookOnSubscribe(Subscription subscription) {
requestToken();