root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch '3.4.x' 

Closes gh-46005
This commit is contained in:
Moritz Halbritter 2025-06-18 10:23:31 +02:00
parent 86f736b677 84e0db53b3
commit 01cb25e7a4
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/management/HeapDumpWebEndpoint.java
View File

@ -29,6 +29,7 @@ import java.nio.channels.ReadableByteChannel;
import java.nio.file.Files;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.Locale;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
@ -47,6 +48,7 @@ import org.springframework.lang.Nullable;
import org.springframework.util.Assert;
import org.springframework.util.ClassUtils;
import org.springframework.util.ReflectionUtils;
import org.springframework.util.StringUtils;
/**
* Web {@link Endpoint @Endpoint} to expose heap dumps.
@ -112,12 +114,22 @@ public class HeapDumpWebEndpoint {
* @throws HeapDumperUnavailableException if the heap dumper cannot be created
*/
protected HeapDumper createHeapDumper() throws HeapDumperUnavailableException {
try {
return new HotSpotDiagnosticMXBeanHeapDumper();
}
catch (HeapDumperUnavailableException ex) {
if (isRunningOnOpenJ9()) {
return new OpenJ9DiagnosticsMXBeanHeapDumper();
}
return new HotSpotDiagnosticMXBeanHeapDumper();
}
private boolean isRunningOnOpenJ9() {
String vmName = System.getProperty("java.vm.name");
if (StringUtils.hasLength(vmName) && vmName.toLowerCase(Locale.ROOT).contains("openj9")) {
return true;
}
String vmVendor = System.getProperty("java.vm.vendor");
if (StringUtils.hasLength(vmVendor) && vmVendor.toLowerCase(Locale.ROOT).contains("openj9")) {
return true;
}
return false;
}
/**