ViewVC Help

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

root/jsr166/jsr166/src/jsr166x/ConcurrentSkipListMap.java

Comparing jsr166/src/jsr166x/ConcurrentSkipListMap.java (file contents):
Revision 1.14 by jsr166, Wed Apr 27 14:06:30 2011 UTC vs.
Revision 1.16 by jsr166, Mon Dec 5 04:48:16 2011 UTC

#	Line 1689 | Line 1689 | public class ConcurrentSkipListMap<K,V>
1689		/* ---------------- Serialization -------------- */
1690
1691		/**
1692	<	* Save the state of the <tt>Map</tt> instance to a stream.
1692	>	* Saves the state of the <tt>Map</tt> instance to a stream.
1693		*
1694		* @serialData The key (Object) and value (Object) for each
1695		* key-value mapping represented by the Map, followed by
#	Line 1714 | Line 1714 | public class ConcurrentSkipListMap<K,V>
1714		}
1715
1716		/**
1717	<	* Reconstitute the <tt>Map</tt> instance from a stream.
1717	>	* Reconstitutes the <tt>Map</tt> instance from a stream.
1718		*/
1719		private void readObject(final java.io.ObjectInputStream s)
1720		throws java.io.IOException, ClassNotFoundException {
#	Line 2305 | Line 2305 | public class ConcurrentSkipListMap<K,V>
2305		* <tt>Comparable</tt>).
2306		* @throws NullPointerException if <tt>fromKey</tt> is <tt>null</tt>.
2307		*/
2308	<	public ConcurrentNavigableMap<K,V>  tailMap(K fromKey) {
2308	>	public ConcurrentNavigableMap<K,V> tailMap(K fromKey) {
2309		if (fromKey == null)
2310		throw new NullPointerException();
2311		return new ConcurrentSkipListSubMap(this, fromKey, null);
#	Line 3241 | Line 3241 | public class ConcurrentSkipListMap<K,V>
3241		return new ConcurrentSkipListSubMap(m, least, toKey);
3242		}
3243
3244	<	public  ConcurrentNavigableMap<K,V> tailMap(K fromKey) {
3244	>	public ConcurrentNavigableMap<K,V> tailMap(K fromKey) {
3245		if (fromKey == null)
3246		throw new NullPointerException();
3247		if (!inOpenRange(fromKey))

Diff Legend

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