From 9eb6b6d3e9a36bc5e7cb23725c3466a9b037ae23 Mon Sep 17 00:00:00 2001 From: Eduard Gizatullin Date: Sat, 29 Aug 2026 03:58:32 +0300 Subject: [PATCH] Improve EncodedResourceResolver encoding selection Closes gh-37210 Signed-off-by: Eduard Gizatullin --- .../web/reactive/resource/EncodedResourceResolver.java | 10 +++++----- .../web/servlet/resource/EncodedResourceResolver.java | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/resource/EncodedResourceResolver.java b/spring-webflux/src/main/java/org/springframework/web/reactive/resource/EncodedResourceResolver.java index 000af7a8e8e9..c05e71974d08 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/resource/EncodedResourceResolver.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/resource/EncodedResourceResolver.java @@ -147,18 +147,18 @@ protected Mono resolveResourceInternal(@Nullable ServerWebExchange exc return resource; } - for (String acceptedCoding : acceptedCodings) { - if (this.contentCodings.contains(acceptedCoding)) { + for (String contentCoding : this.contentCodings) { + if (acceptedCodings.contains(contentCoding)) { try { - String extension = getExtension(acceptedCoding); - Resource encoded = new EncodedResource(resource, acceptedCoding, extension); + String extension = getExtension(contentCoding); + Resource encoded = new EncodedResource(resource, contentCoding, extension); if (encoded.exists()) { return encoded; } } catch (IOException ex) { logger.trace(exchange.getLogPrefix() + - "No " + acceptedCoding + " resource for [" + resource.getFilename() + "]", ex); + "No " + contentCoding + " resource for [" + resource.getFilename() + "]", ex); } } } diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/EncodedResourceResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/EncodedResourceResolver.java index b42abc226c1b..632110bd9be6 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/EncodedResourceResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/EncodedResourceResolver.java @@ -145,18 +145,18 @@ public void registerExtension(String coding, String extension) { return resource; } - for (String acceptedCoding : acceptedCodings) { - if (this.contentCodings.contains(acceptedCoding)) { + for (String contentCoding : this.contentCodings) { + if (acceptedCodings.contains(contentCoding)) { try { - String extension = getExtension(acceptedCoding); - Resource encoded = new EncodedResource(resource, acceptedCoding, extension); + String extension = getExtension(contentCoding); + Resource encoded = new EncodedResource(resource, contentCoding, extension); if (encoded.exists()) { return encoded; } } catch (IOException ex) { if (logger.isTraceEnabled()) { - logger.trace("No " + acceptedCoding + " resource for [" + resource.getFilename() + "]", ex); + logger.trace("No " + contentCoding + " resource for [" + resource.getFilename() + "]", ex); } } }