8197531: Miscellaneous changes imported from jsr166 CVS 2018-04

Reviewed-by: martin, psandoz
This commit is contained in:
Doug Lea 2018-04-10 11:37:18 -07:00
parent a4f3a1d9eb
commit cdd36df363
27 changed files with 194 additions and 34 deletions

View file

@ -6383,7 +6383,7 @@ public class ConcurrentHashMap<K,V> extends AbstractMap<K,V>
ABASE = U.arrayBaseOffset(Node[].class);
int scale = U.arrayIndexScale(Node[].class);
if ((scale & (scale - 1)) != 0)
throw new Error("array index scale not a power of two");
throw new ExceptionInInitializerError("array index scale not a power of two");
ASHIFT = 31 - Integer.numberOfLeadingZeros(scale);
// Reduce the risk of rare disastrous classloading in first call to