ViewVC Help

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

root/jsr166/jsr166/src/extra166y/CustomConcurrentHashMap.java

Comparing jsr166/src/extra166y/CustomConcurrentHashMap.java (file contents):
Revision 1.13 by jsr166, Sat Oct 16 16:40:44 2010 UTC vs.
Revision 1.14 by jsr166, Fri Oct 22 05:18:30 2010 UTC

#	Line 56 | Line 56 | import sun.misc.Unsafe;
56		*            return x instanceof Person && k.name.equals(((Person)x).name);
57		*          }
58		*          public int hash(Object x) {
59	<	*             return (x instanceof Person)? ((Person)x).name.hashCode() : 0;
59	>	*             return (x instanceof Person) ? ((Person)x).name.hashCode() : 0;
60		*          }
61		*        },
62		*      STRONG, EQUALS, 0);
#	Line 1010 | Line 1010 | public class CustomConcurrentHashMap<K,
1010		if (seg != null && seg.getTableForTraversal() != null)
1011		sum += seg.count;
1012		}
1013	<	return sum >= Integer.MAX_VALUE? Integer.MAX_VALUE : (int)sum;
1013	>	return (sum >= Integer.MAX_VALUE) ? Integer.MAX_VALUE : (int) sum;
1014		}
1015
1016		/**
#	Line 1158 | Line 1158 | public class CustomConcurrentHashMap<K,
1158		* <pre>
1159		* map.compute(word, new RemappingFunction&lt;String,Integer&gt;() {
1160		*   public Integer remap(String k, Integer v) {
1161	<	*     return v == null? 1 : v + 1;
1161	>	*     return (v == null) ? 1 : v + 1;
1162		*   }});
1163		* </pre>
1164		*
#	Line 1975 | Line 1975 | public class CustomConcurrentHashMap<K,
1975		}
1976		public final Object getValue() {
1977		EmbeddedWeakReference vr = valueRef;
1978	<	return vr == null? null : vr.get();
1978	>	return (vr == null) ? null : vr.get();
1979		}
1980		public final void setValue(Object value) {
1981		if (value == null)
#	Line 2043 | Line 2043 | public class CustomConcurrentHashMap<K,
2043		}
2044		public final Object getValue() {
2045		EmbeddedSoftReference vr = valueRef;
2046	<	return vr == null? null : vr.get();
2046	>	return (vr == null) ? null : vr.get();
2047		}
2048		public final void setValue(Object value) {
2049		if (value == null)
#	Line 2123 | Line 2123 | public class CustomConcurrentHashMap<K,
2123
2124		static final class TerminalWeakKeySelfValueNode
2125		extends WeakKeySelfValueNode {
2126	<	TerminalWeakKeySelfValueNode(int locator, Object key, CustomConcurrentHashMap cchm) {
2126	>	TerminalWeakKeySelfValueNode(int locator, Object key,
2127	>	CustomConcurrentHashMap cchm) {
2128		super(locator, key, cchm);
2129		}
2130		public final Node getLinkage() { return null; }
#	Line 2275 | Line 2276 | public class CustomConcurrentHashMap<K,
2276		}
2277		public final Object getValue() {
2278		EmbeddedWeakReference vr = valueRef;
2279	<	return vr == null? null : vr.get();
2279	>	return (vr == null) ? null : vr.get();
2280		}
2281		public final void setValue(Object value) {
2282		if (value == null)
#	Line 2338 | Line 2339 | public class CustomConcurrentHashMap<K,
2339		}
2340		public final Object getValue() {
2341		EmbeddedSoftReference vr = valueRef;
2342	<	return vr == null? null : vr.get();
2342	>	return (vr == null) ? null : vr.get();
2343		}
2344		public final void setValue(Object value) {
2345		if (value == null)
#	Line 2570 | Line 2571 | public class CustomConcurrentHashMap<K,
2571		}
2572		public final Object getValue() {
2573		EmbeddedWeakReference vr = valueRef;
2574	<	return vr == null? null : vr.get();
2574	>	return (vr == null) ? null : vr.get();
2575		}
2576		public final void setValue(Object value) {
2577		if (value == null)
#	Line 2633 | Line 2634 | public class CustomConcurrentHashMap<K,
2634		}
2635		public final Object getValue() {
2636		EmbeddedSoftReference vr = valueRef;
2637	<	return vr == null? null : vr.get();
2637	>	return (vr == null) ? null : vr.get();
2638		}
2639		public final void setValue(Object value) {
2640		if (value == null)
#	Line 2861 | Line 2862 | public class CustomConcurrentHashMap<K,
2862		}
2863		public final Object getValue() {
2864		EmbeddedWeakReference vr = valueRef;
2865	<	return vr == null? null : vr.get();
2865	>	return (vr == null) ? null : vr.get();
2866		}
2867		public final void setValue(Object value) {
2868		if (value == null)
#	Line 2918 | Line 2919 | public class CustomConcurrentHashMap<K,
2919		volatile EmbeddedSoftReference valueRef;
2920		final CustomConcurrentHashMap cchm;
2921		IntKeySoftValueNode(int locator, Object key, Object value,
2922	<	CustomConcurrentHashMap cchm) {
2922	>	CustomConcurrentHashMap cchm) {
2923		super(locator, key);
2924		this.cchm = cchm;
2925		if (value != null)
#	Line 2929 | Line 2930 | public class CustomConcurrentHashMap<K,
2930		}
2931		public final Object getValue() {
2932		EmbeddedSoftReference vr = valueRef;
2933	<	return vr == null? null : vr.get();
2933	>	return (vr == null) ? null : vr.get();
2934		}
2935		public final void setValue(Object value) {
2936		if (value == null)

Diff Legend

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