[GR-62624] Fix StaticProperty.javaHome to reflect user input.

pejovica · ansalond · commit f0f3fc60a298 · 2025-02-28T10:14:38.000Z
PullRequest: graal/20200
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/Target_jdk_internal_util_StaticProperty.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/Target_jdk_internal_util_StaticProperty.java
@@ -136,8 +136,7 @@ final class Target_jdk_internal_util_StaticProperty {
 
     @Substitute
     private static String javaHome() {
-        /* Native images do not have a Java home directory. */
-        return null;
+        return SystemPropertiesSupport.singleton().savedProperties.get("java.home");
     }
 
     @Substitute

Original file line number	Diff line number	Diff line change
`@@ -136,8 +136,7 @@ final class Target_jdk_internal_util_StaticProperty {`
`136`	`136`
`137`	`137`	`@Substitute`
`138`	`138`	`private static String javaHome() {`
`139`		`- /* Native images do not have a Java home directory. */`
`140`		`- return null;`
	`139`	`+ return SystemPropertiesSupport.singleton().savedProperties.get("java.home");`
`141`	`140`	`}`
`142`	`141`
`143`	`142`	`@Substitute`