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.38 by dl, Wed Jun 6 15:41:23 2012 UTC vs.
Revision 1.39 by jsr166, Sat Jun 9 16:54:12 2012 UTC

#	Line 960 | Line 960 | public class ConcurrentHashMapV8<K, V>
960		sib = (xp = x.parent) == null ? null : xp.right;
961		}
962		if (sib != null) {
963	<	sib.red = (xp == null)? false : xp.red;
963	>	sib.red = (xp == null) ? false : xp.red;
964		if ((sr = sib.right) != null)
965		sr.red = false;
966		}
#	Line 998 | Line 998 | public class ConcurrentHashMapV8<K, V>
998		sib = (xp = x.parent) == null ? null : xp.left;
999		}
1000		if (sib != null) {
1001	<	sib.red = (xp == null)? false : xp.red;
1001	>	sib.red = (xp == null) ? false : xp.red;
1002		if ((sl = sib.left) != null)
1003		sl.red = false;
1004		}
#	Line 1553 | Line 1553 | public class ConcurrentHashMapV8<K, V>
1553		if (tabAt(tab, i) == f) {
1554		count = 1;
1555		TreeNode p = t.getTreeNode(h, k, t.root);
1556	<	Object pv = (p == null)? null : p.val;
1556	>	Object pv = (p == null) ? null : p.val;
1557		if ((val = mf.remap(k, (V)pv)) != null) {
1558		if (p != null)
1559		p.val = val;

Diff Legend

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