Skip to content

Commit 8de86b7

Browse files
committed
Revised backport version 5.0.11
Issue: SPR-17410 Issue: SPR-17433
1 parent 62885a1 commit 8de86b7

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

spring-web/src/main/java/org/springframework/http/server/reactive/AbstractListenerReadPublisher.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ public final void onError(Throwable ex) {
134134
* Invoked after an I/O read error from the underlying server or after a
135135
* cancellation signal from the downstream consumer to allow sub-classes
136136
* to discard any current cached data they might have.
137-
* @since 5.1.2
137+
* @since 5.0.11
138138
*/
139139
protected abstract void discardData();
140140

spring-web/src/main/java/org/springframework/http/server/reactive/AbstractListenerWriteProcessor.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2017 the original author or authors.
2+
* Copyright 2002-2018 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.
@@ -201,7 +201,7 @@ protected void writingFailed(Throwable ex) {
201201
* to discard in-flight data that was in
202202
* the process of being written when the error took place.
203203
* @param data the data to be released
204-
* @since 5.1.2
204+
* @since 5.0.11
205205
*/
206206
protected abstract void discardData(T data);
207207

spring-webflux/src/main/java/org/springframework/web/reactive/config/ResourceHandlerRegistry.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public ResourceHandlerRegistry(ResourceLoader resourceLoader) {
7979
* Configure the {@link ResourceUrlProvider} that can be used by
8080
* {@link org.springframework.web.reactive.resource.ResourceTransformer} instances.
8181
* @param resourceUrlProvider the resource URL provider to use
82-
* @since 5.1.2
82+
* @since 5.0.11
8383
*/
8484
public void setResourceUrlProvider(@Nullable ResourceUrlProvider resourceUrlProvider) {
8585
this.resourceUrlProvider = resourceUrlProvider;
@@ -94,8 +94,8 @@ public void setResourceUrlProvider(@Nullable ResourceUrlProvider resourceUrlProv
9494
* <p>Patterns like {@code "/static/**"} or {@code "/css/{filename:\\w+\\.css}"}
9595
* are allowed. See {@link org.springframework.web.util.pattern.PathPattern}
9696
* for more details on the syntax.
97-
* @return A {@link ResourceHandlerRegistration} to use to further
98-
* configure the registered resource handler
97+
* @return a {@link ResourceHandlerRegistration} to use to further configure
98+
* the registered resource handler
9999
*/
100100
public ResourceHandlerRegistration addResourceHandler(String... patterns) {
101101
ResourceHandlerRegistration registration = new ResourceHandlerRegistration(this.resourceLoader, patterns);

0 commit comments

Comments
 (0)