From: Jakub Morvay <jmorvay@cisco.com>
Date: Tue, 2 May 2017 08:32:20 +0000 (+0200)
Subject: Bug 8336 - Fix NPE in DistributedShardedDOMDataTree's ProxyProducer
X-Git-Tag: release/nitrogen~293
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=d65678cef128d33202318409ec52146722ae5318

Bug 8336 - Fix NPE in DistributedShardedDOMDataTree's ProxyProducer

Change-Id: If0060e6e2696674bc5418d2f2a80ad0d01327e29
Signed-off-by: Jakub Morvay <jmorvay@cisco.com>
---

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;
             }
         }
     }