src/share/classes/java/util/HashSet.java

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

*** 1,7 ****
  /*
!  * Copyright (c) 1997, 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) 1997, 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
*** 24,33 ****
--- 24,34 ----
   */
  
  package java.util;
  
  import java.io.InvalidObjectException;
+ import sun.misc.SharedSecrets;
  
  /**
   * This class implements the <tt>Set</tt> interface, backed by a hash table
   * (actually a <tt>HashMap</tt> instance).  It makes no guarantees as to the
   * iteration order of the set; in particular, it does not guarantee that the
*** 314,329 ****
          int size = s.readInt();
          if (size < 0) {
              throw new InvalidObjectException("Illegal size: " +
                                               size);
          }
- 
          // Set the capacity according to the size and load factor ensuring that
          // the HashMap is at least 25% full but clamping to maximum capacity.
          capacity = (int) Math.min(size * Math.min(1 / loadFactor, 4.0f),
                  HashMap.MAXIMUM_CAPACITY);
  
          // Create backing HashMap
          map = (((HashSet<?>)this) instanceof LinkedHashSet ?
                 new LinkedHashMap<E,Object>(capacity, loadFactor) :
                 new HashMap<E,Object>(capacity, loadFactor));
  
--- 315,337 ----
          int size = s.readInt();
          if (size < 0) {
              throw new InvalidObjectException("Illegal size: " +
                                               size);
          }
          // Set the capacity according to the size and load factor ensuring that
          // the HashMap is at least 25% full but clamping to maximum capacity.
          capacity = (int) Math.min(size * Math.min(1 / loadFactor, 4.0f),
                  HashMap.MAXIMUM_CAPACITY);
  
+         // Constructing the backing map will lazily create an array when the first element is
+         // added, so check it before construction. Call HashMap.tableSizeFor to compute the
+         // actual allocation size. Check Map.Entry[].class since it's the nearest public type to
+         // what is actually created.
+ 
+         SharedSecrets.getJavaOISAccess()
+                      .checkArray(s, Map.Entry[].class, HashMap.tableSizeFor(capacity));
+ 
          // Create backing HashMap
          map = (((HashSet<?>)this) instanceof LinkedHashSet ?
                 new LinkedHashMap<E,Object>(capacity, loadFactor) :
                 new HashMap<E,Object>(capacity, loadFactor));