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.224 by dl, Tue Jun 18 17:11:45 2013 UTC vs.
Revision 1.225 by jsr166, Tue Jun 18 17:46:16 2013 UTC

#	Line 2597 | Line 2597 | public class ConcurrentHashMap<K,V> impl
2597		return p;
2598		else if (pl == null && pr == null)
2599		break;
2600	<	else if ((kc != null ||
2600	>	else if ((kc != null ||
2601		(kc = comparableClassFor(k)) != null) &&
2602		(dir = compareComparables(kc, k, pk)) != 0)
2603		p = (dir < 0) ? pl : pr;
2604		else if (pl == null)
2605		p = pr;
2606	<	else if (pr == null ||
2606	>	else if (pr == null ||
2607		(q = pr.findTreeNode(h, k, kc)) == null)
2608		p = pl;
2609		else
#	Line 3098 | Line 3098 | public class ConcurrentHashMap<K,V> impl
3098		}
3099		}
3100		}
3101	+
3102		/**
3103		* Recursive invariant check
3104		*/

Diff Legend

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