X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=dom%2Fmdsal-dom-broker%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fmdsal%2Fdom%2Fbroker%2FShardedDOMDataTree.java;h=2ef26a9dc34d7ffa581ec0853f4a51b9fc9951a0;hb=e4a1f8d852e5897ad3b23c04741a0f5e5470cb3f;hp=eb4c1df119b047a19a6c61e467eb4bb139c7ed89;hpb=b8a82c45a32645722c873a47008f97cb0f17e2d3;p=mdsal.git

diff --git a/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/ShardedDOMDataTree.java b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/ShardedDOMDataTree.java
index eb4c1df119..2ef26a9dc3 100644
--- a/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/ShardedDOMDataTree.java
+++ b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/ShardedDOMDataTree.java
@@ -142,7 +142,7 @@ public final class ShardedDOMDataTree implements DOMDataTreeService, DOMDataTree
             Preconditions.checkArgument(producer == null, "Subtree %s is attached to producer %s", subtree, producer);
 
             final DOMDataTreePrefixTableEntry<ShardRegistration<?>> possibleShardReg = shards.lookup(subtree);
-            if (possibleShardReg != null) {
+            if (possibleShardReg != null && possibleShardReg.getValue() != null) {
                 shardMap.put(subtree, possibleShardReg.getValue().getInstance());
             }
         }