--- jsr166/src/jsr166e/ConcurrentHashMapV8.java 2011/10/25 20:26:37 1.31 +++ jsr166/src/jsr166e/ConcurrentHashMapV8.java 2011/12/19 19:18:35 1.34 @@ -1150,7 +1150,7 @@ public class ConcurrentHashMapV8 continue; } else { // transiently use a locked forwarding node - Node g = new Node(MOVED|LOCKED, nextTab, null, null); + Node g = new Node(MOVED|LOCKED, nextTab, null, null); if (!casTabAt(tab, i, f, g)) continue; setTabAt(nextTab, i, null); @@ -1460,8 +1460,8 @@ public class ConcurrentHashMapV8 if (initialCapacity < concurrencyLevel) // Use at least as many bins initialCapacity = concurrencyLevel; // as estimated threads long size = (long)(1.0 + (long)initialCapacity / loadFactor); - int cap = ((size >= (long)MAXIMUM_CAPACITY) ? - MAXIMUM_CAPACITY: tableSizeFor((int)size)); + int cap = ((size >= (long)MAXIMUM_CAPACITY) ? + MAXIMUM_CAPACITY: tableSizeFor((int)size)); this.counter = new LongAdder(); this.sizeCtl = cap; } @@ -2187,7 +2187,7 @@ public class ConcurrentHashMapV8 return true; } - public final boolean removeAll(Collection c) { + public final boolean removeAll(Collection c) { boolean modified = false; for (Iterator it = iter(); it.hasNext();) { if (c.contains(it.next())) { @@ -2237,7 +2237,7 @@ public class ConcurrentHashMapV8 } static final class Values extends MapView - implements Collection { + implements Collection { Values(ConcurrentHashMapV8 map) { super(map); } public final boolean contains(Object o) { return map.containsValue(o); } @@ -2267,7 +2267,7 @@ public class ConcurrentHashMapV8 } } - static final class EntrySet extends MapView + static final class EntrySet extends MapView implements Set> { EntrySet(ConcurrentHashMapV8 map) { super(map); }