spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-09-17 12:09:16 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '3.4.x' into 3.5.x

Browse Source 
Closes gh-46305
This commit is contained in:
Andy Wilkinson
2025-07-07 09:47:34 +01:00
parent a05bf0154e 803a29c656
commit 12310d36c2
2 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/management/HeapDumpWebEndpoint.java
+1 -4
View File
@@ -126,10 +126,7 @@ public class HeapDumpWebEndpoint {
return true;
}
String vmVendor = System.getProperty("java.vm.vendor");
if (StringUtils.hasLength(vmVendor) && vmVendor.toLowerCase(Locale.ROOT).contains("openj9")) {
return true;
}
return false;
return StringUtils.hasLength(vmVendor) && vmVendor.toLowerCase(Locale.ROOT).contains("openj9");
}
/**
spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/net/util/UrlDecoder.java
+2 -4
View File
@@ -73,13 +73,11 @@ public final class UrlDecoder {
private static int fillByteBuffer(ByteBuffer byteBuffer, String string, int index, int length) {
byteBuffer.clear();
while (true) {
do {
byteBuffer.put(unescape(string, index));
index += 3;
if (index >= length || string.charAt(index) != '%') {
break;
}
}
while (index < length && string.charAt(index) == '%');
byteBuffer.flip();
return index;
}