diff --git a/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigClientRetryBootstrapper.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigClientRetryBootstrapper.java index bf551e27..8823a57c 100644 --- a/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigClientRetryBootstrapper.java +++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigClientRetryBootstrapper.java @@ -44,13 +44,12 @@ public class ConfigClientRetryBootstrapper implements BootstrapRegistryInitializ if (resource.getProperties().isFailFast()) { RetryProperties properties = resource.getRetryProperties(); RetryTemplate retryTemplate = RetryTemplateFactory.create(properties, resource.getLog()); - return retryTemplate.execute( - retryContext -> { - if (resource.getLog().isDebugEnabled()) { - resource.getLog().debug("Retry: count=" + retryContext.getRetryCount()); - } - return loadContext.getInvocation().apply(loadContext.getLoaderContext(), resource); - }); + return retryTemplate.execute(retryContext -> { + if (resource.getLog().isDebugEnabled()) { + resource.getLog().debug("Retry: count=" + retryContext.getRetryCount()); + } + return loadContext.getInvocation().apply(loadContext.getLoaderContext(), resource); + }); } return loadContext.getInvocation().apply(loadContext.getLoaderContext(), resource); }); diff --git a/spring-cloud-config-sample/src/test/java/sample/ApplicationFailFastTests.java b/spring-cloud-config-sample/src/test/java/sample/ApplicationFailFastTests.java index 6570fc81..e668f819 100644 --- a/spring-cloud-config-sample/src/test/java/sample/ApplicationFailFastTests.java +++ b/spring-cloud-config-sample/src/test/java/sample/ApplicationFailFastTests.java @@ -44,8 +44,7 @@ public class ApplicationFailFastTests { new SpringApplicationBuilder().sources(Application.class).run("--server.port=0", "--spring.cloud.config.enabled=true", "--spring.cloud.config.fail-fast=true", "--spring.config.import=optional:configserver:http://serverhostdoesnotexist:1234", - "--spring.cloud.config.server.enabled=false", - "--logging.level.org.springframework.retry=TRACE", + "--spring.cloud.config.server.enabled=false", "--logging.level.org.springframework.retry=TRACE", "--logging.level.org.springframework.cloud.config=TRACE", "--logging.level.org.springframework.boot.context.config=TRACE"); }).as("Exception not caused by fail fast").hasMessageContaining("fail fast");