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.292 by jsr166, Sat Apr 23 20:13:21 2016 UTC vs.
Revision 1.293 by jsr166, Sat Jun 4 20:29:20 2016 UTC

#	Line 39 | Line 39 | import java.util.function.ToIntFunction;
39		import java.util.function.ToLongBiFunction;
40		import java.util.function.ToLongFunction;
41		import java.util.stream.Stream;
42	+	import jdk.internal.misc.Unsafe;
43
44		/**
45		* A hash table supporting full concurrency of retrievals and
#	Line 3269 | Line 3270 | public class ConcurrentHashMap<K,V> exte
3270		return true;
3271		}
3272
3273	<	private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
3273	>	private static final Unsafe U = Unsafe.getUnsafe();
3274		private static final long LOCKSTATE;
3275		static {
3276		try {
#	Line 6312 | Line 6313 | public class ConcurrentHashMap<K,V> exte
6313		}
6314
6315		// Unsafe mechanics
6316	<	private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
6316	>	private static final Unsafe U = Unsafe.getUnsafe();
6317		private static final long SIZECTL;
6318		private static final long TRANSFERINDEX;
6319		private static final long BASECOUNT;

Diff Legend

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