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

Merge branch '5.3.x'

This commit is contained in:
Stephane Nicoll 2022-04-12 16:14:05 +02:00
parent 64570a85b3 8b39698553
commit ab7213c823
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -29,7 +29,7 @@ configure(allprojects) { project ->
imports {
mavenBom "com.fasterxml.jackson:jackson-bom:2.13.1"
mavenBom "io.netty:netty-bom:4.1.75.Final"
mavenBom "io.projectreactor:reactor-bom:2020.0.17"
mavenBom "io.projectreactor:reactor-bom:2020.0.18"
mavenBom "io.r2dbc:r2dbc-bom:Borca-SR1"
mavenBom "io.rsocket:rsocket-bom:1.1.2"
mavenBom "org.eclipse.jetty:jetty-bom:11.0.9"

4
spring-core/src/main/java/org/springframework/core/io/buffer/DataBufferUtils.java
View File

@ -1059,7 +1059,7 @@ public abstract class DataBufferUtils {
@Override
public Context currentContext() {
return this.sink.currentContext();
return Context.of(this.sink.contextView());
}
}
@ -1156,7 +1156,7 @@ public abstract class DataBufferUtils {
@Override
public Context currentContext() {
return this.sink.currentContext();
return Context.of(this.sink.contextView());
}
}

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

@ -1,5 +1,5 @@
/*
* Copyright 2002-2021 the original author or authors.
* Copyright 2002-2022 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -105,7 +105,7 @@ final class MultipartParser extends BaseSubscriber<DataBuffer> {
@Override
public Context currentContext() {
return this.sink.currentContext();
return Context.of(this.sink.contextView());
}
@Override

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

@ -1,5 +1,5 @@
/*
* Copyright 2002-2021 the original author or authors.
* Copyright 2002-2022 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -116,7 +116,7 @@ final class PartGenerator extends BaseSubscriber<MultipartParser.Token> {
@Override
public Context currentContext() {
return this.sink.currentContext();
return Context.of(this.sink.contextView());
}
@Override