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 pull request #51744 from icikle

Browse Source 
Closes gh-51744

* pr/51744:
  Polish 'Fix inflater cache race in NestedJarFileResources'
  Fix inflater cache race in NestedJarFileResources
This commit is contained in:
Phillip Webb
2026-09-14 18:09:40 -07:00
parent b923033cb3 d6aac54e2e
commit 9c851cf50a
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
loader/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/NestedJarFileResources.java
+8 -7
View File
@@ -37,6 +37,7 @@ import org.springframework.boot.loader.zip.ZipContent.Kind;
* for registration with a {@link Cleaner}.
*
* @author Phillip Webb
* @author Ian Kettle
*/
class NestedJarFileResources implements Runnable {
@@ -116,7 +117,7 @@ class NestedJarFileResources implements Runnable {
Deque<Inflater> inflaterCache = this.inflaterCache;
if (inflaterCache != null) {
synchronized (inflaterCache) {
Inflater inflater = this.inflaterCache.poll();
Inflater inflater = inflaterCache.poll();
if (inflater != null) {
return inflater;
}
@@ -136,7 +137,7 @@ class NestedJarFileResources implements Runnable {
synchronized (inflaterCache) {
if (this.inflaterCache == inflaterCache && inflaterCache.size() < INFLATER_CACHE_LIMIT) {
inflater.reset();
this.inflaterCache.add(inflater);
inflaterCache.add(inflater);
return;
}
}
@@ -167,13 +168,13 @@ class NestedJarFileResources implements Runnable {
private IOException releaseInflators(IOException exceptionChain) {
Deque<Inflater> inflaterCache = this.inflaterCache;
if (inflaterCache != null) {
try {
synchronized (inflaterCache) {
synchronized (inflaterCache) {
try {
inflaterCache.forEach(Inflater::end);
}
}
finally {
this.inflaterCache = null;
finally {
this.inflaterCache = null;
}
}
}
return exceptionChain;