--- jsr166/src/jdk8/java/util/concurrent/ConcurrentHashMap.java	2016/03/26 12:02:02	1.2
+++ jsr166/src/jdk8/java/util/concurrent/ConcurrentHashMap.java	2016/05/05 16:17:51	1.3
@@ -1213,7 +1213,8 @@ public class ConcurrentHashMap<K,V> exte
      */
     public KeySetView<K,V> keySet() {
         KeySetView<K,V> ks;
-        return (ks = keySet) != null ? ks : (keySet = new KeySetView<K,V>(this, null));
+        if ((ks = keySet) != null) return ks;
+        return keySet = new KeySetView<K,V>(this, null);
     }
 
     /**
@@ -1236,7 +1237,8 @@ public class ConcurrentHashMap<K,V> exte
      */
     public Collection<V> values() {
         ValuesView<K,V> vs;
-        return (vs = values) != null ? vs : (values = new ValuesView<K,V>(this));
+        if ((vs = values) != null) return vs;
+        return values = new ValuesView<K,V>(this);
     }
 
     /**
@@ -1258,7 +1260,8 @@ public class ConcurrentHashMap<K,V> exte
      */
     public Set<Map.Entry<K,V>> entrySet() {
         EntrySetView<K,V> es;
-        return (es = entrySet) != null ? es : (entrySet = new EntrySetView<K,V>(this));
+        if ((es = entrySet) != null) return es;
+        return entrySet = new EntrySetView<K,V>(this);
     }
 
     /**