ViewVC Help

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

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

Comparing jsr166/src/jdk7/java/util/concurrent/ConcurrentHashMap.java (file contents):
Revision 1.4 by jsr166, Mon Jan 14 07:15:18 2013 UTC vs.
Revision 1.5 by dl, Thu Jan 17 14:12:56 2013 UTC

#	Line 2834 | Line 2834 | public class ConcurrentHashMap<K, V>
2834		* @throws NullPointerException if the specified key is null
2835		*/
2836		public boolean remove(Object key, Object value) {
2837	+	if (key == null)
2838	+	throw new NullPointerException();
2839		return value != null && internalReplace(key, null, value) != null;
2840		}
2841
#	Line 4572 | Line 4574 | public class ConcurrentHashMap<K, V>
4574		/**
4575		* Base class for views.
4576		*/
4577	<	static abstract class CHMView<K, V> {
4577	>	static abstract class CHMView<K, V> implements java.io.Serializable {
4578	>	private static final long serialVersionUID = 7249069246763182397L;
4579		final ConcurrentHashMap<K, V> map;
4580		CHMView(ConcurrentHashMap<K, V> map)  { this.map = map; }
4581

Diff Legend

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