Merge branch '3.0.x'

Author: spencergibb

spring-cloud-zookeeper-config/src/main/java/org/springframework/cloud/zookeeper/config/ZookeeperConfigDataLoader.java

@@ -43,6 +43,10 @@ public ZookeeperConfigDataLoader(Log log) {
 	public ConfigData load(ConfigDataLoaderContext context, ZookeeperConfigDataResource resource) {
 		try {
 			CuratorFramework curator = context.getBootstrapContext().get(CuratorFramework.class);
+			if (curator == null) {
+				// this can happen if certain conditions are met
+				return null;
+			}
 			ZookeeperPropertySource propertySource = new ZookeeperPropertySource(resource.getContext(),
 					curator);
 			List<ZookeeperPropertySource> propertySources = Collections.singletonList(propertySource);
@@ -70,7 +74,7 @@ else if (ALL_OPTIONS.size() > 2) {
 		}
 		catch (Exception e) {
 			if (log.isDebugEnabled()) {
-				log.debug("Error getting properties from consul: " + resource, e);
+				log.debug("Error getting properties from zookeeper: " + resource, e);
 			}
 			throw new ConfigDataResourceNotFoundException(resource, e);
 		}

spring-cloud-zookeeper-core/src/main/java/org/springframework/cloud/zookeeper/CuratorFactory.java

@@ -117,8 +117,10 @@ public static void registerCurator(BootstrapRegistry registery, UriComponents lo
 			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);
+				}
 			}
 		});