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.18 by jsr166, Sat Sep 10 01:35:15 2011 UTC vs.
Revision 1.21 by jsr166, Sat Sep 10 05:35:24 2011 UTC

# Line 85 | Line 85 | import java.io.Serializable;
85   * <p><em>jsr166e note: This class is a candidate replacement for
86   * java.util.concurrent.ConcurrentHashMap.<em>
87   *
88 < * @since 1.5
88 > * @since 1.8
89   * @author Doug Lea
90   * @param <K> the type of keys maintained by this map
91   * @param <V> the type of mapped values
# Line 422 | Line 422 | public class ConcurrentHashMapV8<K, V>
422          return table;
423      }
424  
425 <    /*
425 >    /**
426       * Reclassifies nodes in each bin to new table.  Because we are
427       * using power-of-two expansion, the elements from each bin must
428       * either stay at same index, or move with a power of two
# Line 901 | Line 901 | public class ConcurrentHashMapV8<K, V>
901       * establishing the initial table size
902       * @throws IllegalArgumentException if the initial capacity of
903       * elements is negative or the load factor is nonpositive
904 –     *
905 –     * @since 1.6
904       */
905      public ConcurrentHashMapV8(int initialCapacity, float loadFactor) {
906          this(initialCapacity, loadFactor, 1);
# Line 1624 | Line 1622 | public class ConcurrentHashMapV8<K, V>
1622              throws java.io.IOException, ClassNotFoundException {
1623          s.defaultReadObject();
1624          this.segments = null; // unneeded
1625 <        // initalize transient final field
1625 >        // initialize transient final field
1626          UNSAFE.putObjectVolatile(this, counterOffset, new LongAdder());
1627          this.targetCapacity = DEFAULT_CAPACITY;
1628  

Diff Legend

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