From 72ea965fdd5649401804521f733427bcf094b220 Mon Sep 17 00:00:00 2001
From: jovsteva <jovan.j.stevanovic@oracle.com>
Date: Mon, 8 Dec 2025 18:33:59 +0100
Subject: [PATCH] NativeImageResourceFileSystem should throw NPE when uri is
 null.

---
 .../jdk/resources/NativeImageResourceFileSystemProvider.java    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/resources/NativeImageResourceFileSystemProvider.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/resources/NativeImageResourceFileSystemProvider.java
index 43df3fccb8cd..8a5e4d56e67b 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/resources/NativeImageResourceFileSystemProvider.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/resources/NativeImageResourceFileSystemProvider.java
@@ -49,6 +49,7 @@
 import java.nio.file.attribute.FileAttributeView;
 import java.nio.file.spi.FileSystemProvider;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReadWriteLock;
@@ -140,6 +141,7 @@ public FileSystem newFileSystem(Path path, Map<String, ?> env) {
     public FileSystem getFileSystem(URI uri) {
         try {
             readLock.lock();
+            Objects.requireNonNull(uri);
             if (fileSystem == null) {
                 throw new FileSystemNotFoundException("The Native Image Resource File System is not present. " +
                                 "Please create a new file system using the `newFileSystem` operation before attempting any file system operations on resource URIs.");