ViewVC Help

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

root/jsr166/jsr166/src/jsr166e/ConcurrentHashMapV8.java

Comparing jsr166/src/jsr166e/ConcurrentHashMapV8.java (file contents):
Revision 1.120 by dl, Sun Dec 1 20:55:50 2013 UTC vs.
Revision 1.122 by jsr166, Thu Feb 26 06:53:34 2015 UTC

#	Line 15 | Line 15 | import java.lang.reflect.Type;
15		import java.util.AbstractMap;
16		import java.util.Arrays;
17		import java.util.Collection;
18	–	import java.util.Comparator;
18		import java.util.ConcurrentModificationException;
19		import java.util.Enumeration;
20		import java.util.HashMap;
#	Line 2579 | Line 2578 | public class ConcurrentHashMapV8<K,V> ex
2578		final TreeNode<K,V> findTreeNode(int h, Object k, Class<?> kc) {
2579		if (k != null) {
2580		TreeNode<K,V> p = this;
2581	<	do  {
2581	>	do {
2582		int ph, dir; K pk; TreeNode<K,V> q;
2583		TreeNode<K,V> pl = p.left, pr = p.right;
2584		if ((ph = p.hash) > h)
#	Line 3028 | Line 3027 | public class ConcurrentHashMapV8<K,V> ex
3027
3028		static <K,V> TreeNode<K,V> balanceDeletion(TreeNode<K,V> root,
3029		TreeNode<K,V> x) {
3030	<	for (TreeNode<K,V> xp, xpl, xpr;;)  {
3030	>	for (TreeNode<K,V> xp, xpl, xpr;;) {
3031		if (x == null || x == root)
3032		return root;
3033		else if ((xp = x.parent) == null) {

Diff Legend

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