Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.2.x'

Browse Source 
Closes gh-41006
This commit is contained in:
Andy Wilkinson
2024-06-06 14:58:28 +01:00
parent 45f09df7fe 217c2c862b
commit 16302c18b2
2 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/MetaInfVersionsInfo.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2023 the original author or authors.
* Copyright 2012-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -82,15 +82,17 @@ final class MetaInfVersionsInfo {
if (contentEntry.hasNameStartingWith(META_INF_VERSIONS) && !contentEntry.isDirectory()) {
String name = contentEntry.getName();
int slash = name.indexOf('/', META_INF_VERSIONS.length());
String version = name.substring(META_INF_VERSIONS.length(), slash);
try {
int versionNumber = Integer.parseInt(version);
if (versionNumber >= NestedJarFile.BASE_VERSION) {
versions.add(versionNumber);
if (slash > -1) {
String version = name.substring(META_INF_VERSIONS.length(), slash);
try {
int versionNumber = Integer.parseInt(version);
if (versionNumber >= NestedJarFile.BASE_VERSION) {
versions.add(versionNumber);
}
}
catch (NumberFormatException ex) {
// Ignore
}
}
catch (NumberFormatException ex) {
// Ignore
}
}
}