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.267 by jsr166, Mon Feb 23 20:54:08 2015 UTC vs.
Revision 1.268 by jsr166, Wed Mar 4 00:22:30 2015 UTC

#	Line 596 | Line 596 | public class ConcurrentHashMap<K,V> exte
596		this.next = next;
597		}
598
599	<	public final K getKey()        { return key; }
600	<	public final V getValue()      { return val; }
601	<	public final String toString() { return key + "=" + val; }
602	<	public final int hashCode() {
603	<	return key.hashCode() ^ val.hashCode();
599	>	public final K getKey()     { return key; }
600	>	public final V getValue()   { return val; }
601	>	public final int hashCode() { return key.hashCode() ^ val.hashCode(); }
602	>	public final String toString() {
603	>	return Helpers.mapEntryToString(key, val);
604		}
605		public final V setValue(V value) {
606		throw new UnsupportedOperationException();
#	Line 3454 | Line 3454 | public class ConcurrentHashMap<K,V> exte
3454		public K getKey()        { return key; }
3455		public V getValue()      { return val; }
3456		public int hashCode()    { return key.hashCode() ^ val.hashCode(); }
3457	<	public String toString() { return key + "=" + val; }
3457	>	public String toString() {
3458	>	return Helpers.mapEntryToString(key, val);
3459	>	}
3460
3461		public boolean equals(Object o) {
3462		Object k, v; Map.Entry<?,?> e;

Diff Legend

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