From 0e8ed5931de5d420180473290deaa65d59a9ea54 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <jhoeller@pivotal.io>
Date: Mon, 17 Dec 2018 17:55:54 +0100
Subject: [PATCH] Revised backport version 5.0.11

Issue: SPR-17410
Issue: SPR-17433
---
 .../http/server/reactive/AbstractListenerReadPublisher.java | 2 +-
 .../server/reactive/AbstractListenerWriteProcessor.java     | 2 +-
 .../web/reactive/config/ResourceHandlerRegistry.java        | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/AbstractListenerReadPublisher.java b/spring-web/src/main/java/org/springframework/http/server/reactive/AbstractListenerReadPublisher.java
index 4484c4eaa9..3eabf46d86 100644
--- a/spring-web/src/main/java/org/springframework/http/server/reactive/AbstractListenerReadPublisher.java
+++ b/spring-web/src/main/java/org/springframework/http/server/reactive/AbstractListenerReadPublisher.java
@@ -167,7 +167,7 @@ public abstract class AbstractListenerReadPublisher<T> implements Publisher<T> {
 	 * Invoked after an I/O read error from the underlying server or after a
 	 * cancellation signal from the downstream consumer to allow sub-classes
 	 * to discard any current cached data they might have.
-	 * @since 5.1.2
+	 * @since 5.0.11
 	 */
 	protected abstract void discardData();
 
diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/AbstractListenerWriteProcessor.java b/spring-web/src/main/java/org/springframework/http/server/reactive/AbstractListenerWriteProcessor.java
index f6cd1877d8..81b70cf915 100644
--- a/spring-web/src/main/java/org/springframework/http/server/reactive/AbstractListenerWriteProcessor.java
+++ b/spring-web/src/main/java/org/springframework/http/server/reactive/AbstractListenerWriteProcessor.java
@@ -241,7 +241,7 @@ public abstract class AbstractListenerWriteProcessor<T> implements Processor<T,
 	 * to discard in-flight data that was in
 	 * the process of being written when the error took place.
 	 * @param data the data to be released
-	 * @since 5.1.2
+	 * @since 5.0.11
 	 */
 	protected abstract void discardData(T data);
 
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/config/ResourceHandlerRegistry.java b/spring-webflux/src/main/java/org/springframework/web/reactive/config/ResourceHandlerRegistry.java
index 6cad0ec58e..cd2e5d194c 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/config/ResourceHandlerRegistry.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/config/ResourceHandlerRegistry.java
@@ -79,7 +79,7 @@ public class ResourceHandlerRegistry {
 	 * Configure the {@link ResourceUrlProvider} that can be used by
 	 * {@link org.springframework.web.reactive.resource.ResourceTransformer} instances.
 	 * @param resourceUrlProvider the resource URL provider to use
-	 * @since 5.1.2
+	 * @since 5.0.11
 	 */
 	public void setResourceUrlProvider(@Nullable ResourceUrlProvider resourceUrlProvider) {
 		this.resourceUrlProvider = resourceUrlProvider;
@@ -94,8 +94,8 @@ public class ResourceHandlerRegistry {
 	 * <p>Patterns like {@code "/static/**"} or {@code "/css/{filename:\\w+\\.css}"}
 	 * are allowed. See {@link org.springframework.web.util.pattern.PathPattern}
 	 * for more details on the syntax.
-	 * @return a {@link ResourceHandlerRegistration} to use to further
-	 * configure the registered resource handler
+	 * @return a {@link ResourceHandlerRegistration} to use to further configure
+	 * the registered resource handler
 	 */
 	public ResourceHandlerRegistration addResourceHandler(String... patterns) {
 		ResourceHandlerRegistration registration = new ResourceHandlerRegistration(this.resourceLoader, patterns);