archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 15:24:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8254876: (fs) NullPointerException not thrown when first argument to Path.of or Paths.get is null

Browse source 
Reviewed-by: rriggs, alanb
This commit is contained in:
Brian Burkhalter 2020-11-03 19:39:28 +00:00
parent b46d73bee8
commit 450452bb8c
3 changed files with 17 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/java.base/unix/classes/sun/nio/fs/UnixFileSystem.java
View file

@ -257,6 +257,7 @@ abstract class UnixFileSystem
@Override @Override
public final Path getPath(String first, String... more) { public final Path getPath(String first, String... more) {
Objects.requireNonNull(first);
String path; String path;
if (more.length == 0) { if (more.length == 0) {
path = first; path = first;

3
src/java.base/windows/classes/sun/nio/fs/WindowsFileSystem.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2008, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -211,6 +211,7 @@ class WindowsFileSystem
@Override @Override
public final Path getPath(String first, String... more) { public final Path getPath(String first, String... more) {
Objects.requireNonNull(first);
String path; String path;
if (more.length == 0) { if (more.length == 0) {
path = first; path = first;

16
test/jdk/java/nio/file/Path/PathOps.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2008, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -22,7 +22,7 @@
*/ */
/* @test /* @test
* @bug 4313887 6838333 6925932 7006126 8037945 8072495 8140449 * @bug 4313887 6838333 6925932 7006126 8037945 8072495 8140449 8254876
* @summary Unit test for java.nio.file.Path path operations * @summary Unit test for java.nio.file.Path path operations
*/ */
@ -2042,6 +2042,18 @@ public class PathOps {
static void npes() { static void npes() {
header("NullPointerException"); header("NullPointerException");
try {
Path.of(null, "foo");
throw new RuntimeException("NullPointerException not thrown");
} catch (NullPointerException npe) {
}
try {
Path.of("foo", null);
throw new RuntimeException("NullPointerException not thrown");
} catch (NullPointerException npe) {
}
Path path = FileSystems.getDefault().getPath("foo"); Path path = FileSystems.getDefault().getPath("foo");
try { try {