8285405: add test and check for negative argument to HashMap::newHashMap et al

Reviewed-by: chegar, naoto, lancea, smarks
This commit is contained in:
Jaikiran Pai 2022-08-11 02:17:01 +00:00
parent 2e0a17c560
commit 4b03e135e1
6 changed files with 41 additions and 2 deletions

View file

@ -2578,6 +2578,9 @@ public class HashMap<K,V> extends AbstractMap<K,V>
* @since 19
*/
public static <K, V> HashMap<K, V> newHashMap(int numMappings) {
if (numMappings < 0) {
throw new IllegalArgumentException("Negative number of mappings: " + numMappings);
}
return new HashMap<>(calculateHashMapCapacity(numMappings));
}

View file

@ -394,6 +394,9 @@ public class HashSet<E>
* @since 19
*/
public static <T> HashSet<T> newHashSet(int numElements) {
if (numElements < 0) {
throw new IllegalArgumentException("Negative number of elements: " + numElements);
}
return new HashSet<>(HashMap.calculateHashMapCapacity(numElements));
}

View file

@ -810,6 +810,9 @@ public class LinkedHashMap<K,V>
* @since 19
*/
public static <K, V> LinkedHashMap<K, V> newLinkedHashMap(int numMappings) {
if (numMappings < 0) {
throw new IllegalArgumentException("Negative number of mappings: " + numMappings);
}
return new LinkedHashMap<>(HashMap.calculateHashMapCapacity(numMappings));
}

View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2000, 2022, 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
@ -215,6 +215,9 @@ public class LinkedHashSet<E>
* @since 19
*/
public static <T> LinkedHashSet<T> newLinkedHashSet(int numElements) {
if (numElements < 0) {
throw new IllegalArgumentException("Negative number of elements: " + numElements);
}
return new LinkedHashSet<>(HashMap.calculateHashMapCapacity(numElements));
}

View file

@ -1357,6 +1357,9 @@ public class WeakHashMap<K,V>
* @since 19
*/
public static <K, V> WeakHashMap<K, V> newWeakHashMap(int numMappings) {
if (numMappings < 0) {
throw new IllegalArgumentException("Negative number of mappings: " + numMappings);
}
return new WeakHashMap<>(HashMap.calculateHashMapCapacity(numMappings));
}