BUG-7464: Refactor KVNode

[yangtools.git] / third-party / triemap / src / main / java / org / opendaylight / yangtools / triemap / TrieMap.java

diff --git a/third-party/triemap/src/main/java/org/opendaylight/yangtools/triemap/TrieMap.java b/third-party/triemap/src/main/java/org/opendaylight/yangtools/triemap/TrieMap.java
index 0b2b8987919f9bba75ee12e596b83334a39c68b8..e421646ed0cb0ecbfdf50d6a55535fd145236bae 100644 (file)
--- a/third-party/triemap/src/main/java/org/opendaylight/yangtools/triemap/TrieMap.java
+++ b/third-party/triemap/src/main/java/org/opendaylight/yangtools/triemap/TrieMap.java
@@ -443,7 +443,7 @@ public final class TrieMap<K, V> extends AbstractMap<K, V> implements Concurrent
         private final int[] stackpos = new int[7];
         private int depth = -1;
         private Iterator<Entry<K, V>> subiter = null;
-        private KVNode<K, V> current = null;
+        private EntryNode<K, V> current = null;
         private Entry<K, V> lastReturned = null;
 
         TrieMapIterator (final int level, final TrieMap<K, V> ct, final boolean mustInit) {
@@ -476,7 +476,7 @@ public final class TrieMap<K, V> extends AbstractMap<K, V> implements Concurrent
                 r = subiter.next ();
                 checkSubiter ();
             } else {
-                r = current.kvPair ();
+                r = current;
                 advance ();
             }