From: Robert Varga <rovarga@cisco.com>
Date: Tue, 10 Jan 2017 22:20:44 +0000 (+0100)
Subject: BUG-7464: improve keySet()/entrySet() bytecode
X-Git-Tag: release/carbon~113
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=364fdb01d0270d099491c3d781e4ad44b90ff2b8;p=yangtools.git

BUG-7464: improve keySet()/entrySet() bytecode

Shave off a few instructions by using expressions rather than
verbose assignment.

Change-Id: I12adc79be895cceea3feddfeb4cc100bcee0b883
Signed-off-by: Robert Varga <rovarga@cisco.com>
---

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..5bcefcaa1e 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
@@ -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