X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=third-party%2Ftriemap%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fyangtools%2Ftriemap%2FTrieMap.java;h=36cf5cc3613d140d4b634ca6aa9219c0a146dca4;hb=ffab937a0decc3921ec3688410abcd557136f448;hp=b0261bf0e871679dfbb097df4c93f03f197b8edb;hpb=24a850c1cbacd32e00c42d1714410ff11e1d7647;p=yangtools.git

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 b0261bf0e8..36cf5cc361 100644
--- 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
@@ -50,7 +50,7 @@ public abstract class TrieMap<K, V> extends AbstractMap<K, V> implements Concurr
         this.equiv = equiv;
     }
 
-    public static <K, V> TrieMap<K, V> create() {
+    public static <K, V> MutableTrieMap<K, V> create() {
         return new MutableTrieMap<>(Equivalence.equals());
     }
 
@@ -96,20 +96,14 @@ public abstract class TrieMap<K, V> extends AbstractMap<K, V> implements Concurr
 
     @Override
     public final Set<Entry<K, V>> entrySet() {
-        AbstractEntrySet<K, V> ret = entrySet;
-        if (ret == null) {
-            entrySet = ret = createEntrySet();
-        }
-        return ret;
+        final AbstractEntrySet<K, V> ret;
+        return (ret = entrySet) != null ? ret : (entrySet = createEntrySet());
     }
 
     @Override
     public final Set<K> keySet() {
-        AbstractKeySet<K> ret = keySet;
-        if (ret == null) {
-            keySet = ret = createKeySet();
-        }
-        return ret;
+        final AbstractKeySet<K> ret;
+        return (ret = keySet) != null ? ret : (keySet = createKeySet());
     }
 
     @Override