From 81f7896feb2812430ea138d67e68e00d205974b6 Mon Sep 17 00:00:00 2001 From: Jakub Morvay Date: Tue, 2 May 2017 10:32:20 +0200 Subject: [PATCH] Bug 8336 - Fix NPE in DistributedShardedDOMDataTree's ProxyProducer Change-Id: If0060e6e2696674bc5418d2f2a80ad0d01327e29 Signed-off-by: Jakub Morvay --- .../cluster/sharding/DistributedShardedDOMDataTree.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/DistributedShardedDOMDataTree.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/DistributedShardedDOMDataTree.java index 54b33a4ccd..564fb978be 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/DistributedShardedDOMDataTree.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/DistributedShardedDOMDataTree.java @@ -702,7 +702,8 @@ public class DistributedShardedDOMDataTree implements DOMDataTreeService, DOMDat // producer attached to some subtree at a time. And also how we can close ShardAccess // then final CDSShardAccessImpl shardAccess = new CDSShardAccessImpl(subtree, actorContext); - return shardAccessMap.put(subtree, shardAccess); + shardAccessMap.put(subtree, shardAccess); + return shardAccess; } } } -- 2.36.6