ViewVC Help

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

root/jsr166/jsr166/src/jsr166e/ConcurrentHashMapV8.java

Comparing jsr166/src/jsr166e/ConcurrentHashMapV8.java (file contents):
Revision 1.29 by dl, Mon Oct 3 11:20:47 2011 UTC vs.
Revision 1.30 by jsr166, Sun Oct 9 19:57:49 2011 UTC

#	Line 595 | Line 595 | public class ConcurrentHashMapV8<K, V>
595		} finally {
596		if (!f.casHash(fh | LOCKED, fh)) {
597		f.hash = fh;
598	<	synchronized(f) { f.notifyAll(); };
598	>	synchronized (f) { f.notifyAll(); };
599		}
600		}
601		if (validated) {
#	Line 752 | Line 752 | public class ConcurrentHashMapV8<K, V>
752		} finally {
753		if (!f.casHash(fh | LOCKED, fh)) {
754		f.hash = fh;
755	<	synchronized(f) { f.notifyAll(); };
755	>	synchronized (f) { f.notifyAll(); };
756		}
757		}
758		if (validated) {
#	Line 789 | Line 789 | public class ConcurrentHashMapV8<K, V>
789		setTabAt(tab, i, null);
790		if (!node.casHash(fh, h)) {
791		node.hash = h;
792	<	synchronized(node) { node.notifyAll(); };
792	>	synchronized (node) { node.notifyAll(); };
793		}
794		}
795		}
#	Line 843 | Line 843 | public class ConcurrentHashMapV8<K, V>
843		} finally {
844		if (!f.casHash(fh | LOCKED, fh)) {
845		f.hash = fh;
846	<	synchronized(f) { f.notifyAll(); };
846	>	synchronized (f) { f.notifyAll(); };
847		}
848		}
849		if (validated)
#	Line 1002 | Line 1002 | public class ConcurrentHashMapV8<K, V>
1002		} finally {
1003		if (!f.casHash(fh | LOCKED, fh)) {
1004		f.hash = fh;
1005	<	synchronized(f) { f.notifyAll(); };
1005	>	synchronized (f) { f.notifyAll(); };
1006		}
1007		}
1008		if (validated) {
#	Line 1099 | Line 1099 | public class ConcurrentHashMapV8<K, V>
1099		while ((sc = sizeCtl) >= 0) {
1100		Node[] tab = table; int n;
1101		if (tab == null || (n = tab.length) == 0) {
1102	<	n = (sc > c)? sc : c;
1102	>	n = (sc > c) ? sc : c;
1103		if (UNSAFE.compareAndSwapInt(this, sizeCtlOffset, sc, -1)) {
1104		try {
1105		if (table == tab) {
#	Line 1271 | Line 1271 | public class ConcurrentHashMapV8<K, V>
1271		} finally {
1272		if (!f.casHash(fh | LOCKED, fh)) {
1273		f.hash = fh;
1274	<	synchronized(f) { f.notifyAll(); };
1274	>	synchronized (f) { f.notifyAll(); };
1275		}
1276		}
1277		if (validated)

Diff Legend

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