ViewVC Help

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

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

Comparing jsr166/src/main/java/util/concurrent/ConcurrentSkipListMap.java (file contents):
Revision 1.123 by dl, Tue May 7 20:25:36 2013 UTC vs.
Revision 1.124 by dl, Sun Jun 16 14:48:11 2013 UTC

#	Line 1705 | Line 1705 | public class ConcurrentSkipListMap<K,V>
1705		if ((n = findNode(key)) == null) {
1706		if ((r = remappingFunction.apply(key, null)) == null)
1707		break;
1708	<	if (doPut(key, r, false) == null)
1708	>	if (doPut(key, r, true) == null)
1709		return r;
1710		}
1711		else if ((v = n.value) != null) {
#	Line 1743 | Line 1743 | public class ConcurrentSkipListMap<K,V>
1743		for (;;) {
1744		Node<K,V> n; Object v; V r;
1745		if ((n = findNode(key)) == null) {
1746	<	if (doPut(key, value, false) == null)
1746	>	if (doPut(key, value, true) == null)
1747		return value;
1748		}
1749		else if ((v = n.value) != null) {

Diff Legend

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