8232092: (fs) Files::isWritable returns false on a writeable root dir…

…ectory (win) Reviewed-by: alanb
openjdk · Oct 7, 2020 · abe2593 · abe2593 · bridgekeeper · Oct 7, 2020
1 parent 5a9bd41
commit abe2593
Show file tree

Hide file tree

Showing 2 changed files with 483 additions and 1 deletion.
diff --git a/src/java.base/windows/classes/sun/nio/fs/WindowsFileStore.java b/src/java.base/windows/classes/sun/nio/fs/WindowsFileStore.java
@@ -82,7 +82,12 @@ static WindowsFileStore create(WindowsPath file) throws IOException {
             try {
                 return createFromPath(target);
             } catch (WindowsException e) {
-                if (e.lastError() != ERROR_DIR_NOT_ROOT)
+                // GetVolumePathName might return the following error codes
+                // when the drives were created using `subst`.
+                // Try expanding the path again in such cases.
+                if (e.lastError() != ERROR_DIR_NOT_ROOT &&
+                    e.lastError() != ERROR_INVALID_PARAMETER &&
+                    e.lastError() != ERROR_DIRECTORY)
                     throw e;
                 target = WindowsLinkSupport.getFinalPath(file);
                 if (target == null)