提交 3aa63cac 编写于 作者: A alanb

7023034: Files.createTempDirectory((Path)null, "temp") does not throw NPE

Reviewed-by: forax
上级 369f95e5
......@@ -794,7 +794,8 @@ public final class Files {
FileAttribute<?>... attrs)
throws IOException
{
return TempFileHelper.createTempFile(dir, prefix, suffix, attrs);
return TempFileHelper.createTempFile(Objects.requireNonNull(dir),
prefix, suffix, attrs);
}
/**
......@@ -891,7 +892,8 @@ public final class Files {
FileAttribute<?>... attrs)
throws IOException
{
return TempFileHelper.createTempDirectory(dir, prefix, attrs);
return TempFileHelper.createTempDirectory(Objects.requireNonNull(dir),
prefix, attrs);
}
/**
......
......@@ -22,7 +22,7 @@
*/
/* @test
* @bug 4313887 6838333 7006126
* @bug 4313887 6838333 7006126 7023034
* @summary Unit test for Files.createTempXXX
* @library ..
*/
......@@ -167,5 +167,31 @@ public class TemporaryFiles {
testInvalidFileTemp("../blah", null);
testInvalidFileTemp("dir/blah", null);
testInvalidFileTemp("blah", ".dat/foo");
// nulls
try {
Files.createTempFile("blah", ".tmp", (FileAttribute<?>[])null);
throw new RuntimeException("NullPointerException expected");
} catch (NullPointerException ignore) { }
try {
Files.createTempFile("blah", ".tmp", new FileAttribute<?>[] { null });
throw new RuntimeException("NullPointerException expected");
} catch (NullPointerException ignore) { }
try {
Files.createTempDirectory("blah", (FileAttribute<?>[])null);
throw new RuntimeException("NullPointerException expected");
} catch (NullPointerException ignore) { }
try {
Files.createTempDirectory("blah", new FileAttribute<?>[] { null });
throw new RuntimeException("NullPointerException expected");
} catch (NullPointerException ignore) { }
try {
Files.createTempFile((Path)null, "blah", ".tmp");
throw new RuntimeException("NullPointerException expected");
} catch (NullPointerException ignore) { }
try {
Files.createTempDirectory((Path)null, "blah");
throw new RuntimeException("NullPointerException expected");
} catch (NullPointerException ignore) { }
}
}
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册