From 2fbc4162e808f14b6114499f49db3e6ef1590f24 Mon Sep 17 00:00:00 2001
From: Fabian Meumertzheim <fmeum@openjdk.org>
Date: Tue, 6 Jan 2026 08:09:42 +0000
Subject: [PATCH] 8374441: (fs) FileSystemProvider.readAttributesIfExists
 throws "Not a directory" when element in path is not directory should return
 null for ENOTDIR (unix)

Reviewed-by: alanb
---
 .../sun/nio/fs/UnixFileAttributes.java        |  5 ++--
 .../java/nio/file/Files/NotADirectory.java    | 25 ++++++++++++++++---
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/src/java.base/unix/classes/sun/nio/fs/UnixFileAttributes.java b/src/java.base/unix/classes/sun/nio/fs/UnixFileAttributes.java
index 55661ff12a3..d41df6dd5be 100644
--- a/src/java.base/unix/classes/sun/nio/fs/UnixFileAttributes.java
+++ b/src/java.base/unix/classes/sun/nio/fs/UnixFileAttributes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2026, 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
@@ -98,7 +98,8 @@ class UnixFileAttributes
                                                   path, flag, attrs);
         if (errno == 0)
             return attrs;
-        else if (errno == UnixConstants.ENOENT)
+        else if (errno == UnixConstants.ENOENT ||
+                 errno == UnixConstants.ENOTDIR)
             return null;
         else
             throw new UnixException(errno);
diff --git a/test/jdk/java/nio/file/Files/NotADirectory.java b/test/jdk/java/nio/file/Files/NotADirectory.java
index bd561ca5c4b..5bae8a6caa2 100644
--- a/test/jdk/java/nio/file/Files/NotADirectory.java
+++ b/test/jdk/java/nio/file/Files/NotADirectory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, 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
@@ -22,9 +22,10 @@
  */
 
 /* @test
- * @bug 8356678
+ * @bug 8356678 8374441
  * @requires (os.family != "windows")
- * @summary Test Files operations when a path component is not a directory
+ * @summary Test Files and FileSystemProvider operations when a path component
+ *          is not a directory
  * @run junit NotADirectory
  */
 
@@ -32,10 +33,12 @@ import java.io.IOException;
 import java.nio.file.CopyOption;
 import java.nio.file.Files;
 import java.nio.file.FileSystemException;
+import java.nio.file.FileSystems;
 import java.nio.file.NoSuchFileException;
 import java.nio.file.Path;
 import java.nio.file.attribute.BasicFileAttributes;
 import java.nio.file.attribute.PosixFileAttributes;
+import java.nio.file.spi.FileSystemProvider;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Stream;
@@ -51,10 +54,14 @@ import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class NotADirectory {
+    private static final FileSystemProvider PROVIDER =
+        FileSystems.getDefault().provider();
+
     private static final Path ROOT      = Path.of(".");
     private static final Path NOT_EXIST = ROOT.resolve("notExist");
     private static final Path DIR       = ROOT.resolve("dir");
@@ -143,6 +150,18 @@ public class NotADirectory {
                      () -> Files.readAttributes(BOGUS, PosixFileAttributes.class));
     }
 
+    @Test
+    public void readBasicIfExists() throws IOException {
+        assertNull(
+            PROVIDER.readAttributesIfExists(BOGUS, BasicFileAttributes.class));
+    }
+
+    @Test
+    public void readPosixIfExists() throws IOException {
+        assertNull(
+            PROVIDER.readAttributesIfExists(BOGUS, PosixFileAttributes.class));
+    }
+
     @Test
     public void exists() throws IOException {
         assertFalse(Files.exists(BOGUS));