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.284 by jsr166, Sat Sep 19 21:39:44 2015 UTC vs.
Revision 1.285 by jsr166, Sun Sep 20 17:03:22 2015 UTC

#	Line 1339 | Line 1339 | public class ConcurrentHashMap<K,V> exte
1339
1340		/**
1341		* Stripped-down version of helper class used in previous version,
1342	<	* declared for the sake of serialization compatibility
1342	>	* declared for the sake of serialization compatibility.
1343		*/
1344		static class Segment<K,V> extends ReentrantLock implements Serializable {
1345		private static final long serialVersionUID = 2249069246763182397L;
#	Line 1594 | Line 1594 | public class ConcurrentHashMap<K,V> exte
1594		}
1595
1596		/**
1597	<	* Helper method for EntrySetView.removeIf
1597	>	* Helper method for EntrySetView.removeIf.
1598		*/
1599		boolean removeEntryIf(Predicate<? super Entry<K,V>> function) {
1600		if (function == null) throw new NullPointerException();
#	Line 1614 | Line 1614 | public class ConcurrentHashMap<K,V> exte
1614		}
1615
1616		/**
1617	<	* Helper method for ValuesView.removeIf
1617	>	* Helper method for ValuesView.removeIf.
1618		*/
1619		boolean removeValueIf(Predicate<? super V> function) {
1620		if (function == null) throw new NullPointerException();
#	Line 2222 | Line 2222 | public class ConcurrentHashMap<K,V> exte
2222		}
2223
2224		/**
2225	<	* A place-holder node used in computeIfAbsent and compute
2225	>	* A place-holder node used in computeIfAbsent and compute.
2226		*/
2227		static final class ReservationNode<K,V> extends Node<K,V> {
2228		ReservationNode() {
#	Line 2671 | Line 2671 | public class ConcurrentHashMap<K,V> exte
2671		/* ---------------- TreeNodes -------------- */
2672
2673		/**
2674	<	* Nodes for use in TreeBins
2674	>	* Nodes for use in TreeBins.
2675		*/
2676		static final class TreeNode<K,V> extends Node<K,V> {
2677		TreeNode<K,V> parent;  // red-black tree links
#	Line 3234 | Line 3234 | public class ConcurrentHashMap<K,V> exte
3234		}
3235
3236		/**
3237	<	* Recursive invariant check
3237	>	* Checks invariants recursively for the tree of Nodes rooted at t.
3238		*/
3239		static <K,V> boolean checkInvariants(TreeNode<K,V> t) {
3240		TreeNode<K,V> tp = t.parent, tl = t.left, tr = t.right,
#	Line 3479 | Line 3479 | public class ConcurrentHashMap<K,V> exte
3479		}
3480
3481		/**
3482	<	* Exported Entry for EntryIterator
3482	>	* Exported Entry for EntryIterator.
3483		*/
3484		static final class MapEntry<K,V> implements Map.Entry<K,V> {
3485		final K key; // non-null
#	Line 4856 | Line 4856 | public class ConcurrentHashMap<K,V> exte
4856		}
4857
4858		/**
4859	<	* Same as Traverser version
4859	>	* Same as Traverser version.
4860		*/
4861		final Node<K,V> advance() {
4862		Node<K,V> e;

Diff Legend

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