Fix for NPE
Project: http://git-wip-us.apache.org/repos/asf/aries-rsa/repo Commit: http://git-wip-us.apache.org/repos/asf/aries-rsa/commit/362b68d6 Tree: http://git-wip-us.apache.org/repos/asf/aries-rsa/tree/362b68d6 Diff: http://git-wip-us.apache.org/repos/asf/aries-rsa/diff/362b68d6 Branch: refs/heads/master Commit: 362b68d69225f78002e7db0118b76c9cec1b4b4f Parents: 7544836 Author: Christian Schneider <cschn...@adobe.com> Authored: Thu Feb 8 17:27:05 2018 +0100 Committer: Christian Schneider <cschn...@adobe.com> Committed: Thu Feb 8 17:40:34 2018 +0100 ---------------------------------------------------------------------- .../zookeeper/repository/ZookeeperEndpointRepository.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/362b68d6/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/repository/ZookeeperEndpointRepository.java ---------------------------------------------------------------------- diff --git a/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/repository/ZookeeperEndpointRepository.java b/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/repository/ZookeeperEndpointRepository.java index c5c03a4..6e2641f 100644 --- a/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/repository/ZookeeperEndpointRepository.java +++ b/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/repository/ZookeeperEndpointRepository.java @@ -247,13 +247,17 @@ public class ZookeeperEndpointRepository implements Closeable, Watcher { private void handleRemoved(String path) { EndpointDescription endpoint = nodes.remove(path); EndpointEvent event = new EndpointEvent(EndpointEvent.REMOVED, endpoint); - listener.endpointChanged(event, null); + if (listener != null) { + listener.endpointChanged(event, null); + } } private void handleChanged(String path, EndpointDescription endpoint) { EndpointDescription old = nodes.put(path, endpoint); EndpointEvent event = new EndpointEvent(old == null ? EndpointEvent.ADDED : EndpointEvent.MODIFIED, endpoint); - listener.endpointChanged(event, null); + if (listener != null) { + listener.endpointChanged(event, null); + } } }
