svm: fix Windows file system providers for future defaults [GR-65860]

zapster · zapster · commit cc6b282e3607 · 2025-06-12T10:17:30.000+02:00
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/buildtimeinit/FileSystemProviderBuildTimeInitSupport.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/buildtimeinit/FileSystemProviderBuildTimeInitSupport.java
@@ -351,7 +351,7 @@ private static synchronized void reinitialize(Target_sun_nio_fs_UnixFileSystem_B
  * fields so we cannot re-use the substitutions.
  */
 
-@TargetClass(className = "sun.nio.fs.WindowsFileSystem")
+@TargetClass(className = "sun.nio.fs.WindowsFileSystem", onlyWith = JDKInitializedAtBuildTime.class)
 @Platforms({Platform.WINDOWS.class})
 final class Target_sun_nio_fs_WindowsFileSystem_BuildTime {
 
@@ -381,7 +381,7 @@ final class Target_sun_nio_fs_WindowsFileSystem_BuildTime {
     native void originalConstructor(Target_sun_nio_fs_WindowsFileSystemProvider_BuildTime p, String dir);
 }
 
-@TargetClass(className = "sun.nio.fs.WindowsFileSystemProvider")
+@TargetClass(className = "sun.nio.fs.WindowsFileSystemProvider", onlyWith = JDKInitializedAtBuildTime.class)
 @Platforms({Platform.WINDOWS.class})
 final class Target_sun_nio_fs_WindowsFileSystemProvider_BuildTime {
 }
@@ -455,7 +455,7 @@ static void setUserDir(Target_java_io_FileSystem_BuildTime that, String value) {
     }
 }
 
-@TargetClass(className = "java.io.WinNTFileSystem")
+@TargetClass(className = "java.io.WinNTFileSystem", onlyWith = JDKInitializedAtBuildTime.class)
 @Platforms(Platform.WINDOWS.class)
 final class Target_java_io_WinNTFileSystem_BuildTime {
 

Original file line number	Diff line number	Diff line change
`@@ -351,7 +351,7 @@ private static synchronized void reinitialize(Target_sun_nio_fs_UnixFileSystem_B`
`351`	`351`	`* fields so we cannot re-use the substitutions.`
`352`	`352`	`*/`
`353`	`353`
`354`		`-@TargetClass(className = "sun.nio.fs.WindowsFileSystem")`
	`354`	`+@TargetClass(className = "sun.nio.fs.WindowsFileSystem", onlyWith = JDKInitializedAtBuildTime.class)`
`355`	`355`	`@Platforms({Platform.WINDOWS.class})`
`356`	`356`	`final class Target_sun_nio_fs_WindowsFileSystem_BuildTime {`
`357`	`357`
`@@ -381,7 +381,7 @@ final class Target_sun_nio_fs_WindowsFileSystem_BuildTime {`
`381`	`381`	`native void originalConstructor(Target_sun_nio_fs_WindowsFileSystemProvider_BuildTime p, String dir);`
`382`	`382`	`}`
`383`	`383`
`384`		`-@TargetClass(className = "sun.nio.fs.WindowsFileSystemProvider")`
	`384`	`+@TargetClass(className = "sun.nio.fs.WindowsFileSystemProvider", onlyWith = JDKInitializedAtBuildTime.class)`
`385`	`385`	`@Platforms({Platform.WINDOWS.class})`
`386`	`386`	`final class Target_sun_nio_fs_WindowsFileSystemProvider_BuildTime {`
`387`	`387`	`}`
`@@ -455,7 +455,7 @@ static void setUserDir(Target_java_io_FileSystem_BuildTime that, String value) {`
`455`	`455`	`}`
`456`	`456`	`}`
`457`	`457`
`458`		`-@TargetClass(className = "java.io.WinNTFileSystem")`
	`458`	`+@TargetClass(className = "java.io.WinNTFileSystem", onlyWith = JDKInitializedAtBuildTime.class)`
`459`	`459`	`@Platforms(Platform.WINDOWS.class)`
`460`	`460`	`final class Target_java_io_WinNTFileSystem_BuildTime {`
`461`	`461`