From b81a374ceecbbf2392413fe51b4d3c34111129d7 Mon Sep 17 00:00:00 2001 From: jovsteva Date: Thu, 3 Oct 2024 18:56:30 +0200 Subject: [PATCH 1/2] Improve the error message in a case when NativeImageFileSystemProvider is not present. --- .../resources/NativeImageResourceFileSystemProvider.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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 3d7f3fbf116f..e1f2bd083d8c 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 @@ -25,8 +25,6 @@ package com.oracle.svm.core.jdk.resources; -import com.oracle.svm.core.jdk.JavaNetSubstitutions; - import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; @@ -56,6 +54,8 @@ import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; +import com.oracle.svm.core.jdk.JavaNetSubstitutions; + public class NativeImageResourceFileSystemProvider extends FileSystemProvider { private final String resourcePath = "/resources"; @@ -141,7 +141,8 @@ public FileSystem getFileSystem(URI uri) { try { readLock.lock(); if (fileSystem == null) { - throw new FileSystemNotFoundException(); + 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."); } return fileSystem; } finally { From 085e8beb5d01f1c60e79191ac14281fe66467aa6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20W=C3=B6gerer?= Date: Mon, 7 Oct 2024 14:22:46 +0000 Subject: [PATCH 2/2] Addressing the comments. --- .../jdk/resources/NativeImageResourceFileSystemProvider.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 e1f2bd083d8c..43df3fccb8cd 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 @@ -142,7 +142,7 @@ public FileSystem getFileSystem(URI uri) { readLock.lock(); 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."); + "Please create a new file system using the `newFileSystem` operation before attempting any file system operations on resource URIs."); } return fileSystem; } finally {