Apache
/
commons-collections
mirror of https://github.com/apache/commons-collections.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitbox.apache.org/repos/asf/commons-collections.git

This commit is contained in:
Gary Gregory 2019-12-09 14:39:31 -05:00
parent e7d3a10392 45080bed99
commit dd69cc72dc
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/org/apache/commons/collections4/keyvalue/MultiKey.java
View File

@ -126,7 +126,7 @@ public class MultiKey<K> implements Serializable {
* This is equivalent to <code>new MultiKey(keys, true)</code>.
*
* @param keys the array of keys, not null
* @throws IllegalArgumentException if the key array is null
* @throws NullPointerException if the key array is null
*/
public MultiKey(final K[] keys) {
this(keys, true);
@ -153,13 +153,13 @@ public class MultiKey<K> implements Serializable {
*
* @param keys the array of keys, not null
* @param makeClone true to clone the array, false to assign it
* @throws IllegalArgumentException if the key array is null
* @throws NullPointerException if the key array is null
* @since 3.1
*/
public MultiKey(final K[] keys, final boolean makeClone) {
super();
if (keys == null) {
throw new IllegalArgumentException("The array of keys must not be null");
throw new NullPointerException("The array of keys must not be null");
}
if (makeClone) {
this.keys = keys.clone();

2
src/main/java/org/apache/commons/collections4/set/ListOrderedSet.java
View File

@ -147,7 +147,7 @@ public class ListOrderedSet<E>
* Constructor that wraps (not copies).
*
* @param set the set to decorate, must not be null
* @throws IllegalArgumentException if set is null
* @throws NullPointerException if set is null
*/
protected ListOrderedSet(final Set<E> set) {
super(set);

6
src/test/java/org/apache/commons/collections4/keyvalue/MultiKeyTest.java
View File

@ -96,15 +96,15 @@ public class MultiKeyTest {
try {
new MultiKey<>(keys);
fail();
} catch (final IllegalArgumentException ex) {}
} catch (final NullPointerException ex) {}
try {
new MultiKey<>(keys, true);
fail();
} catch (final IllegalArgumentException ex) {}
} catch (final NullPointerException ex) {}
try {
new MultiKey<>(keys, false);
fail();
} catch (final IllegalArgumentException ex) {}
} catch (final NullPointerException ex) {}
}
@Test