ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/jsr166/jsr166/src/main/java/util/concurrent/ConcurrentHashMap.java

Comparing jsr166/src/main/java/util/concurrent/ConcurrentHashMap.java (file contents):
Revision 1.291 by jsr166, Tue Apr 19 22:55:29 2016 UTC vs.
Revision 1.292 by jsr166, Sat Apr 23 20:13:21 2016 UTC

#	Line 1213 | Line 1213 | public class ConcurrentHashMap<K,V> exte
1213		*/
1214		public KeySetView<K,V> keySet() {
1215		KeySetView<K,V> ks;
1216	<	return (ks = keySet) != null ? ks : (keySet = new KeySetView<K,V>(this, null));
1216	>	if ((ks = keySet) != null) return ks;
1217	>	return keySet = new KeySetView<K,V>(this, null);
1218		}
1219
1220		/**
#	Line 1236 | Line 1237 | public class ConcurrentHashMap<K,V> exte
1237		*/
1238		public Collection<V> values() {
1239		ValuesView<K,V> vs;
1240	<	return (vs = values) != null ? vs : (values = new ValuesView<K,V>(this));
1240	>	if ((vs = values) != null) return vs;
1241	>	return values = new ValuesView<K,V>(this);
1242		}
1243
1244		/**
#	Line 1258 | Line 1260 | public class ConcurrentHashMap<K,V> exte
1260		*/
1261		public Set<Map.Entry<K,V>> entrySet() {
1262		EntrySetView<K,V> es;
1263	<	return (es = entrySet) != null ? es : (entrySet = new EntrySetView<K,V>(this));
1263	>	if ((es = entrySet) != null) return es;
1264	>	return entrySet = new EntrySetView<K,V>(this);
1265		}
1266
1267		/**

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines