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.153 by dl, Fri Dec 21 19:32:23 2012 UTC vs.
Revision 1.154 by jsr166, Thu Dec 27 20:29:07 2012 UTC

#	Line 5868 | Line 5868 | public class ConcurrentHashMap<K, V>
5868		K r = null;
5869		while (advance() != null) {
5870		K u = (K)nextKey;
5871	<	r = (r == null) ? u : u == null? r : reducer.apply(r, u);
5871	>	r = (r == null) ? u : u == null ? r : reducer.apply(r, u);
5872		}
5873		result = r;
5874		CountedCompleter<?> c;
#	Line 5909 | Line 5909 | public class ConcurrentHashMap<K, V>
5909		(map, this, b, rights, reducer)).fork();
5910		V r = null, v;
5911		while ((v = advance()) != null)
5912	<	r = (r == null) ? v : v == null? r : reducer.apply(r, v);
5912	>	r = (r == null) ? v : v == null ? r : reducer.apply(r, v);
5913		result = r;
5914		CountedCompleter<?> c;
5915		for (c = firstComplete(); c != null; c = c.nextComplete()) {

Diff Legend

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