ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/jsr166/jsr166/src/main/java/util/concurrent/ConcurrentHashMap.java

Comparing jsr166/src/main/java/util/concurrent/ConcurrentHashMap.java (file contents):
Revision 1.108 by jsr166, Fri Apr 22 19:06:43 2011 UTC vs.
Revision 1.109 by jsr166, Wed Apr 27 12:58:52 2011 UTC

#	Line 665 | Line 665 | public class ConcurrentHashMap<K, V> ext
665		// Hash-based segment and entry accesses
666
667		/**
668	<	* Get the segment for the given hash
668	>	* Gets the segment for the given hash code.
669		*/
670		@SuppressWarnings("unchecked")
671		private Segment<K,V> segmentForHash(int h) {
#	Line 674 | Line 674 | public class ConcurrentHashMap<K, V> ext
674		}
675
676		/**
677	<	* Gets the table entry for the given segment and hash
677	>	* Gets the table entry for the given segment and hash code.
678		*/
679		@SuppressWarnings("unchecked")
680		static final <K,V> HashEntry<K,V> entryForHash(Segment<K,V> seg, int h) {
#	Line 1232 | Line 1232 | public class ConcurrentHashMap<K, V> ext
1232		}
1233
1234		/**
1235	<	* Set nextEntry to first node of next non-empty table
1235	>	* Sets nextEntry to first node of next non-empty table
1236		* (in backwards order, to simplify checks).
1237		*/
1238		final void advance() {
#	Line 1301 | Line 1301 | public class ConcurrentHashMap<K, V> ext
1301		}
1302
1303		/**
1304	<	* Set our entry's value and write through to the map. The
1304	>	* Sets our entry's value and writes through to the map. The
1305		* value to return is somewhat arbitrary here. Since a
1306		* WriteThroughEntry does not necessarily track asynchronous
1307		* changes, the most recent "previous" value could be
#	Line 1397 | Line 1397 | public class ConcurrentHashMap<K, V> ext
1397		/* ---------------- Serialization Support -------------- */
1398
1399		/**
1400	<	* Save the state of the <tt>ConcurrentHashMap</tt> instance to a
1401	<	* stream (i.e., serialize it).
1400	>	* Saves the state of the <tt>ConcurrentHashMap</tt> instance to a
1401	>	* stream (i.e., serializes it).
1402		* @param s the stream
1403		* @serialData
1404		* the key (Object) and value (Object)
#	Line 1433 | Line 1433 | public class ConcurrentHashMap<K, V> ext
1433		}
1434
1435		/**
1436	<	* Reconstitute the <tt>ConcurrentHashMap</tt> instance from a
1437	<	* stream (i.e., deserialize it).
1436	>	* Reconstitutes the <tt>ConcurrentHashMap</tt> instance from a
1437	>	* stream (i.e., deserializes it).
1438		* @param s the stream
1439		*/
1440		@SuppressWarnings("unchecked")

Diff Legend

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