ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/main/java/util/concurrent/ConcurrentHashMap.java
(Generate patch)

Comparing jsr166/src/main/java/util/concurrent/ConcurrentHashMap.java (file contents):
Revision 1.257 by jsr166, Tue Jun 3 23:49:57 2014 UTC vs.
Revision 1.258 by dl, Sat Oct 25 18:04:44 2014 UTC

# Line 2318 | Line 2318 | public class ConcurrentHashMap<K,V> exte
2318                  break;
2319              else if (tab == table) {
2320                  int rs = resizeStamp(n);
2321 <                if (sc < 0) {
2322 <                    Node<K,V>[] nt;
2323 <                    if ((sc >>> RESIZE_STAMP_SHIFT) != rs || sc == rs + 1 ||
2324 <                        sc == rs + MAX_RESIZERS || (nt = nextTable) == null ||
2325 <                        transferIndex <= 0)
2326 <                        break;
2327 <                    if (U.compareAndSwapInt(this, SIZECTL, sc, sc + 1))
2328 <                        transfer(tab, nt);
2329 <                }
2330 <                else if (U.compareAndSwapInt(this, SIZECTL, sc,
2331 <                                             (rs << RESIZE_STAMP_SHIFT) + 2))
2321 >                if (U.compareAndSwapInt(this, SIZECTL, sc,
2322 >                                        (rs << RESIZE_STAMP_SHIFT) + 2))
2323                      transfer(tab, null);
2324              }
2325          }

Diff Legend

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