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

Merge pull request #3 from alfredodiaz/master

Browse Source 
prevent NullPointerException if znode contains no data. TODO comment …
This commit is contained in:
Spencer Gibb
2015-05-19 11:02:41 -04:00
parent 1a0938866e e98c2dbb36
commit 2aed6b16aa
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
spring-cloud-zookeeper-config/src/main/java/org/springframework/cloud/zookeeper/config/ZookeeperPropertySource.java
View File

@@ -42,6 +42,11 @@ public class ZookeeperPropertySource extends EnumerablePropertySource<CuratorFra
cache = TreeCache.newBuilder(source, context).build();
cache.start();
running = true;
/*
TODO: race condition since TreeCache.process(..) is invoked asynchronously.
Methods getProperty and getPropertyNames could be invoked before that TreeCache.process(..) receives
all the WatchedEvents.
*/
}
catch (NoNodeException e) {
// no node, ignore
@@ -74,7 +79,7 @@ public class ZookeeperPropertySource extends EnumerablePropertySource<CuratorFra
return;
for (Map.Entry<String, ChildData> entry : children.entrySet()) {
ChildData child = entry.getValue();
if (child.getData().length == 0) {
if (child.getData()==null || child.getData().length == 0) {
findKeys(keys, child.getPath());
}
else {