Skip to content

Commit 8b39698

Browse files
committed
Upgrade to Reactor 2020.0.18
Closes gh-28329
1 parent 6fad00e commit 8b39698

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

Diff for: build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ configure(allprojects) { project ->
2929
imports {
3030
mavenBom "com.fasterxml.jackson:jackson-bom:2.12.6"
3131
mavenBom "io.netty:netty-bom:4.1.75.Final"
32-
mavenBom "io.projectreactor:reactor-bom:2020.0.17"
32+
mavenBom "io.projectreactor:reactor-bom:2020.0.18"
3333
mavenBom "io.r2dbc:r2dbc-bom:Arabba-SR13"
3434
mavenBom "io.rsocket:rsocket-bom:1.1.2"
3535
mavenBom "org.eclipse.jetty:jetty-bom:9.4.46.v20220331"

Diff for: spring-core/src/main/java/org/springframework/core/io/buffer/DataBufferUtils.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2021 the original author or authors.
2+
* Copyright 2002-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -1061,7 +1061,7 @@ protected void hookOnComplete() {
10611061

10621062
@Override
10631063
public Context currentContext() {
1064-
return this.sink.currentContext();
1064+
return Context.of(this.sink.contextView());
10651065
}
10661066

10671067
}
@@ -1158,7 +1158,7 @@ private void sinkDataBuffer() {
11581158

11591159
@Override
11601160
public Context currentContext() {
1161-
return this.sink.currentContext();
1161+
return Context.of(this.sink.contextView());
11621162
}
11631163

11641164
}

Diff for: spring-web/src/main/java/org/springframework/http/codec/multipart/MultipartParser.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2021 the original author or authors.
2+
* Copyright 2002-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -105,7 +105,7 @@ public static Flux<Token> parse(Flux<DataBuffer> buffers, byte[] boundary, int m
105105

106106
@Override
107107
public Context currentContext() {
108-
return this.sink.currentContext();
108+
return Context.of(this.sink.contextView());
109109
}
110110

111111
@Override

Diff for: spring-web/src/main/java/org/springframework/http/codec/multipart/PartGenerator.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2021 the original author or authors.
2+
* Copyright 2002-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -116,7 +116,7 @@ public static Flux<Part> createParts(Flux<MultipartParser.Token> tokens, int max
116116

117117
@Override
118118
public Context currentContext() {
119-
return this.sink.currentContext();
119+
return Context.of(this.sink.contextView());
120120
}
121121

122122
@Override

0 commit comments

Comments
 (0)