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.7 by dl, Mon Nov 2 11:47:36 2009 UTC vs.
Revision 1.10 by dl, Fri Feb 12 12:38:25 2010 UTC

#	Line 53 | Line 53 | import sun.misc.Unsafe;
53		*     (STRONG,
54		*      new Equivalence<Person>() {
55		*          public boolean equal(Person k, Object x) {
56	<	*            return x instanceOf Person && k.name.equals(((Person)x).name);
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 537 | Line 537 | public class CustomConcurrentHashMap<K,
537		while (capacity < sc)
538		capacity <<= 1;
539		if (capacity > MAX_SEGMENT_CAPACITY)
540	<	capacity = MAX_SEGMENT_CAPACITY;
540	>	capacity = MAX_SEGMENT_CAPACITY;
541		this.initialSegmentCapacity = capacity;
542		}
543		this.segments = (Segment[])new Segment[NSEGMENTS];
#	Line 2101 | Line 2101 | public class CustomConcurrentHashMap<K,
2101		final int locator;
2102		final CustomConcurrentHashMap cchm;
2103		WeakKeyNode(int locator, Object key, CustomConcurrentHashMap cchm) {
2104	<	super(key);
2104	>	super(key, getReclamationQueue());
2105		this.locator = locator;
2106		this.cchm = cchm;
2107		}
#	Line 2396 | Line 2396 | public class CustomConcurrentHashMap<K,
2396		final int locator;
2397		final CustomConcurrentHashMap cchm;
2398		SoftKeyNode(int locator, Object key, CustomConcurrentHashMap cchm) {
2399	<	super(key);
2399	>	super(key, getReclamationQueue());
2400		this.locator = locator;
2401		this.cchm = cchm;
2402		}

Diff Legend

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