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

Revised backport version 5.0.11

Browse Source 
Issue: SPR-17410
Issue: SPR-17433
This commit is contained in:
Juergen Hoeller
2018-12-17 17:55:54 +01:00
parent 62885a1922
commit 8de86b7fb3
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -134,7 +134,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();

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

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2017 the original author or authors.
* Copyright 2002-2018 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.
@@ -201,7 +201,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);

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

@@ -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);