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

Merge branch '5.3.x'

Browse Source
This commit is contained in:
Arjen Poutsma
2021-11-19 12:38:06 +01:00
parent 2be80b8fc8 722ab25f27
commit 9d65ff73f9
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-web/src/main/java/org/springframework/web/util/UriUtils.java
View File

@@ -407,7 +407,7 @@ public abstract class UriUtils {
int paramIndex = path.indexOf(';', begin); int paramIndex = path.indexOf(';', begin);
end = (paramIndex != -1 && paramIndex < end ? paramIndex : end); end = (paramIndex != -1 && paramIndex < end ? paramIndex : end);
int extIndex = path.lastIndexOf('.', end); int extIndex = path.lastIndexOf('.', end);
if (extIndex != -1 && extIndex > begin) { if (extIndex != -1 && extIndex >= begin) {
return path.substring(extIndex + 1, end); return path.substring(extIndex + 1, end);
} }
return null; return null;

1
spring-web/src/test/java/org/springframework/web/util/UriUtilsTests.java
View File

@@ -133,6 +133,7 @@ public class UriUtilsTests {
assertThat(UriUtils.extractFileExtension("/products;q=11/view.html?param=/path/a.do")).isEqualTo("html"); assertThat(UriUtils.extractFileExtension("/products;q=11/view.html?param=/path/a.do")).isEqualTo("html");
assertThat(UriUtils.extractFileExtension("/products;q=11/view.html;r=22?param=/path/a.do")).isEqualTo("html"); assertThat(UriUtils.extractFileExtension("/products;q=11/view.html;r=22?param=/path/a.do")).isEqualTo("html");
assertThat(UriUtils.extractFileExtension("/products;q=11/view.html;r=22;s=33?param=/path/a.do")).isEqualTo("html"); assertThat(UriUtils.extractFileExtension("/products;q=11/view.html;r=22;s=33?param=/path/a.do")).isEqualTo("html");
assertThat(UriUtils.extractFileExtension("/products/.html")).isEqualTo("html");
} }
} }