src/share/classes/java/util/Hashtable.java

rev 12533 : 8174109: Better queuing priorities
Reviewed-by: smarks

*** 1,7 ****
  /*
!  * Copyright (c) 1994, 2013, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  /*
!  * Copyright (c) 1994, 2017, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
*** 28,37 ****
--- 28,38 ----
  import java.io.*;
  import java.util.concurrent.ThreadLocalRandom;
  import java.util.function.BiConsumer;
  import java.util.function.Function;
  import java.util.function.BiFunction;
+ import sun.misc.SharedSecrets;
  
  /**
   * This class implements a hash table, which maps keys to values. Any
   * non-<code>null</code> object can be used as a key or as a value. <p>
   *
*** 1190,1199 ****
--- 1191,1204 ----
          // Guard against the length ending up zero, that's not valid.
          int length = (int)((elements + elements / 20) / loadFactor) + 3;
          if (length > elements && (length & 1) == 0)
              length--;
          length = Math.min(length, origlength);
+ 
+         // Check Map.Entry[].class since it's the nearest public type to
+         // what we're actually creating.
+         SharedSecrets.getJavaOISAccess().checkArray(s, Map.Entry[].class, length);
          table = new Entry<?,?>[length];
          threshold = (int)Math.min(length * loadFactor, MAX_ARRAY_SIZE + 1);
          count = 0;
  
          // Read the number of elements and then all the key/value objects