ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/jsr166e/ConcurrentHashMapV8.java
(Generate patch)

Comparing jsr166/src/jsr166e/ConcurrentHashMapV8.java (file contents):
Revision 1.102 by dl, Wed Jun 19 14:55:40 2013 UTC vs.
Revision 1.103 by jsr166, Wed Jun 19 16:22:44 2013 UTC

# Line 228 | Line 228 | public class ConcurrentHashMapV8<K,V>
228       * java.util.Spliterator.
229       */
230      public static interface ConcurrentHashMapSpliterator<T> {
231 <        /**
231 >        /**
232           * If possible, returns a new spliterator covering
233           * approximately one half of the elements, which will not be
234           * covered by this spliterator. Returns null if cannot be
# Line 735 | Line 735 | public class ConcurrentHashMapV8<K,V>
735                                          Node<K,V> c, Node<K,V> v) {
736          return U.compareAndSwapObject(tab, ((long)i << ASHIFT) + ABASE, c, v);
737      }
738 <    
738 >
739      static final <K,V> void setTabAt(Node<K,V>[] tab, int i, Node<K,V> v) {
740          U.putOrderedObject(tab, ((long)i << ASHIFT) + ABASE, v);
741      }
742 <    
742 >
743      /* ---------------- Fields -------------- */
744  
745      /**
# Line 2530 | Line 2530 | public class ConcurrentHashMapV8<K,V>
2530                          return p;
2531                      else if (pl == null && pr == null)
2532                          break;
2533 <                    else if ((kc != null ||
2533 >                    else if ((kc != null ||
2534                                (kc = comparableClassFor(k)) != null) &&
2535                               (dir = compareComparables(kc, k, pk)) != 0)
2536                          p = (dir < 0) ? pl : pr;
2537                      else if (pl == null)
2538                          p = pr;
2539 <                    else if (pr == null ||
2539 >                    else if (pr == null ||
2540                               (q = pr.findTreeNode(h, k, kc)) == null)
2541                          p = pl;
2542                      else
# Line 3034 | Line 3034 | public class ConcurrentHashMapV8<K,V>
3034                  }
3035              }
3036          }
3037 +
3038          /**
3039           * Recursive invariant check
3040           */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines