Merge branch '2.2.x'

spring-cloud · May 22, 2020 · 2e6e619 · 2e6e619
2 parents 1995f3c + b828877
commit 2e6e619
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/...springframework/cloud/client/discovery/simple/SimpleDiscoveryClientAutoConfiguration.java b/...springframework/cloud/client/discovery/simple/SimpleDiscoveryClientAutoConfiguration.java
@@ -21,6 +21,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.AutoConfigureBefore;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.web.ServerProperties;
 import org.springframework.boot.web.context.WebServerInitializedEvent;
 import org.springframework.cloud.client.CommonsClientAutoConfiguration;
@@ -57,6 +58,7 @@ public class SimpleDiscoveryClientAutoConfiguration
 	private SimpleDiscoveryProperties simple = new SimpleDiscoveryProperties();
 
 	@Bean
+	@ConditionalOnMissingBean
 	public SimpleDiscoveryProperties simpleDiscoveryProperties() {
 		simple.getLocal().setServiceId(this.serviceId);
 		simple.getLocal()