ViewVC Help

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

root/jsr166/jsr166/src/main/java/util/HashMap.java

Comparing jsr166/src/main/java/util/HashMap.java (file contents):
Revision 1.2 by jsr166, Sun Sep 3 16:15:38 2017 UTC vs.
Revision 1.5 by jsr166, Tue May 22 16:16:57 2018 UTC

#	Line 1 | Line 1
1		/*
2	<	* Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
2	>	* Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
3		* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4		*
5		* This code is free software; you can redistribute it and/or modify it
#	Line 34 | Line 34 | import java.util.function.BiConsumer;
34		import java.util.function.BiFunction;
35		import java.util.function.Consumer;
36		import java.util.function.Function;
37	+	import jdk.internal.misc.SharedSecrets;
38
39		/**
40		* Hash table based implementation of the {@code Map} interface.  This
#	Line 375 | Line 376 | public class HashMap<K,V> extends Abstra
376		* Returns a power of two size for the given target capacity.
377		*/
378		static final int tableSizeFor(int cap) {
379	<	int n = cap - 1;
379	<	n |= n >>> 1;
380	<	n |= n >>> 2;
381	<	n |= n >>> 4;
382	<	n |= n >>> 8;
383	<	n |= n >>> 16;
379	>	int n = -1 >>> Integer.numberOfLeadingZeros(cap - 1);
380		return (n < 0) ? 1 : (n >= MAXIMUM_CAPACITY) ? MAXIMUM_CAPACITY : n + 1;
381		}
382
#	Line 1448 | Line 1444 | public class HashMap<K,V> extends Abstra
1444		float ft = (float)cap * lf;
1445		threshold = ((cap < MAXIMUM_CAPACITY && ft < MAXIMUM_CAPACITY) ?
1446		(int)ft : Integer.MAX_VALUE);
1447	+
1448	+	// Check Map.Entry[].class since it's the nearest public type to
1449	+	// what we're actually creating.
1450	+	SharedSecrets.getJavaObjectInputStreamAccess().checkArray(s, Map.Entry[].class, cap);
1451		@SuppressWarnings({"rawtypes","unchecked"})
1452		Node<K,V>[] tab = (Node<K,V>[])new Node[cap];
1453		table = tab;

Diff Legend

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