BUG 5697 : Consumer support in shards

[mdsal.git] / dom / mdsal-dom-spi / src / main / java / org / opendaylight / mdsal / dom / spi / DOMDataTreePrefixTableEntry.java

diff --git a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/DOMDataTreePrefixTableEntry.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/DOMDataTreePrefixTableEntry.java
index 52aaf4a788b11400c9d42739a733444dafe4cc1f..7243b0869dd57c645f8e6402a2247d899b44837f 100644 (file)
--- a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/DOMDataTreePrefixTableEntry.java
+++ b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/DOMDataTreePrefixTableEntry.java
@@ -48,6 +48,7 @@ public final class DOMDataTreePrefixTableEntry<V> implements Identifiable<PathAr
     DOMDataTreePrefixTableEntry<V> lookup(final YangInstanceIdentifier id) {
         final Iterator<PathArgument> it = id.getPathArguments().iterator();
         DOMDataTreePrefixTableEntry<V> entry = this;
+        DOMDataTreePrefixTableEntry<V> lastPresentEntry = entry;
 
         while (it.hasNext()) {
             final PathArgument a = it.next();
@@ -58,9 +59,13 @@ public final class DOMDataTreePrefixTableEntry<V> implements Identifiable<PathAr
             }
 
             entry = child;
+
+            if (child.getValue() != null) {
+                lastPresentEntry = child;
+            }
         }
 
-        return entry;
+        return lastPresentEntry;
     }
 
     void store(final YangInstanceIdentifier id, final V reg) {