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.115 by jsr166, Fri Dec 2 14:28:17 2011 UTC vs.
Revision 1.116 by jsr166, Mon Dec 12 20:53:11 2011 UTC

# Line 1389 | Line 1389 | public class ConcurrentHashMap<K, V> ext
1389      /* ---------------- Serialization Support -------------- */
1390  
1391      /**
1392 <     * Saves the state of the <tt>ConcurrentHashMap</tt> instance to a
1393 <     * stream (i.e., serializes it).
1394 <     * @param s the stream
1392 >     * Saves this map to a stream (that is, serializes it).
1393 >     *
1394       * @serialData
1395       * the key (Object) and value (Object)
1396       * for each key-value mapping, followed by a null pair.
# Line 1426 | Line 1425 | public class ConcurrentHashMap<K, V> ext
1425      }
1426  
1427      /**
1428 <     * Reconstitutes the <tt>ConcurrentHashMap</tt> instance from a
1430 <     * stream (i.e., deserializes it).
1431 <     * @param s the stream
1428 >     * Reconstitutes this map from a stream (that is, deserializes it).
1429       */
1430      @SuppressWarnings("unchecked")
1431      private void readObject(java.io.ObjectInputStream s)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines