archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-22 12:04:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

8201407: Files.move throws DirectoryNonEmptyException when moving directory across file system

Browse source 
Reviewed-by: alanb
This commit is contained in:
Brian Burkhalter 2018-06-07 07:43:29 -07:00
parent 9f39d8c408
commit e9f3b0e527
4 changed files with 41 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/java.base/windows/classes/sun/nio/fs/WindowsFileCopy.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2008, 2018, 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
@ -249,6 +249,17 @@ class WindowsFileCopy {
}
}
// throw a DirectoryNotEmpty exception if not empty
static void ensureEmptyDir(WindowsPath dir) throws IOException {
try (WindowsDirectoryStream dirStream =
new WindowsDirectoryStream(dir, (e) -> true)) {
if (dirStream.iterator().hasNext()) {
throw new DirectoryNotEmptyException(
dir.getPathForExceptionMessage());
}
}
}
/**
* Move file from source to target
*/
@ -407,6 +418,7 @@ class WindowsFileCopy {
// create new directory or directory junction
try {
if (sourceAttrs.isDirectory()) {
ensureEmptyDir(source);
CreateDirectory(targetPath, 0L);
} else {
String linkTarget = WindowsLinkSupport.readLink(source);