SpringCloud/spring-cloud-commons
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/2.2.x'

Browse Source 
# Conflicts:
#	docs/pom.xml
#	pom.xml
#	spring-cloud-commons-dependencies/pom.xml
#	spring-cloud-commons/pom.xml
#	spring-cloud-context-integration-tests/pom.xml
#	spring-cloud-context-webflux-integration-tests/pom.xml
#	spring-cloud-context/pom.xml
#	spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/encrypt/EnvironmentDecryptApplicationInitializerTests.java
#	spring-cloud-loadbalancer/pom.xml
#	spring-cloud-starter-loadbalancer/pom.xml
#	spring-cloud-starter/pom.xml
#	spring-cloud-test-support/pom.xml
This commit is contained in:
Olga Maciaszek-Sharma
2020-08-11 13:25:00 +02:00
parent 46eec89c0c 018aae3632
commit 7beca68a39
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/DiscoveryClientServiceInstanceListSupplier.java
View File

@@ -64,13 +64,14 @@ public class DiscoveryClientServiceInstanceListSupplier
resolveTimeout(environment);
this.serviceInstances = Flux
.defer(() -> Flux.just(delegate.getInstances(serviceId)))
.subscribeOn(Schedulers.boundedElastic())
.timeout(timeout, Flux.defer(() -> {
logTimeout();
return Flux.just(new ArrayList<>());
})).onErrorResume(error -> {
logException(error);
return Flux.just(new ArrayList<>());
}).subscribeOn(Schedulers.boundedElastic());
});
}
public DiscoveryClientServiceInstanceListSupplier(ReactiveDiscoveryClient delegate,