Skip to content

Commit c9df9aa

Browse files
committed
Merge pull request #43517 from big-cir
* pr/43517: Polish "Remove "java.home" system property when running in a native image" Remove "java.home" system property when running in a native image Closes gh-43517
2 parents d735027 + 7c6dbbf commit c9df9aa

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/system/ApplicationTemp.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import java.util.concurrent.locks.Lock;
3232
import java.util.concurrent.locks.ReentrantLock;
3333

34+
import org.springframework.core.NativeDetector;
3435
import org.springframework.util.Assert;
3536
import org.springframework.util.StringUtils;
3637

@@ -145,7 +146,9 @@ private byte[] generateHash(Class<?> sourceClass) {
145146
update(digest, home.getSource());
146147
update(digest, home.getDir());
147148
update(digest, System.getProperty("user.dir"));
148-
update(digest, System.getProperty("java.home"));
149+
if (!NativeDetector.inNativeImage()) {
150+
update(digest, System.getProperty("java.home"));
151+
}
149152
update(digest, System.getProperty("java.class.path"));
150153
update(digest, System.getProperty("sun.java.command"));
151154
update(digest, System.getProperty("sun.boot.class.path"));

0 commit comments

Comments
 (0)