Fixes for ZookeeperConfigServerBootstrapper inconsistencies.

Do not create a property source if CuratorFramework is null in ZookeeperConfigDataLoader.

Do not register CuratorFramework twice in CuratorFactory

Fixes gh-290
This commit is contained in:
spencergibb
2021-12-10 12:50:50 -05:00
parent 599ae49f87
commit 583709f132
2 changed files with 8 additions and 2 deletions

View File

@@ -117,8 +117,10 @@ public abstract class CuratorFactory {
BootstrapContext context = event.getBootstrapContext();
if (predicate.test(context)) {
CuratorFramework curatorFramework = context.get(CuratorFramework.class);
event.getApplicationContext().getBeanFactory().registerSingleton("configDataCuratorFramework",
curatorFramework);
if (!event.getApplicationContext().getBeanFactory().containsBean("configDataCuratorFramework")) {
event.getApplicationContext().getBeanFactory().registerSingleton("configDataCuratorFramework",
curatorFramework);
}
}
});