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

Don't initialize spring.config.import bootstrapper if bootstrap on classpath.

Browse Source 
Fixes gh-288
This commit is contained in:
spencergibb
2021-12-10 12:23:50 -05:00
parent aae46ebafc
commit 599ae49f87
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/configclient/ZookeeperConfigServerBootstrapper.java
View File

@@ -45,7 +45,9 @@ public class ZookeeperConfigServerBootstrapper implements Bootstrapper {
@Override
@SuppressWarnings("unchecked")
public void intitialize(BootstrapRegistry registry) {
if (!ClassUtils.isPresent("org.springframework.cloud.config.client.ConfigServerInstanceProvider", null)) {
if (!ClassUtils.isPresent("org.springframework.cloud.config.client.ConfigServerInstanceProvider", null) ||
// don't run if bootstrap enabled, how to check the property?
ClassUtils.isPresent("org.springframework.cloud.bootstrap.marker.Marker", null)) {
return;
}
// create curator