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

Merge branch '6.2.x'

Browse Source 
# Conflicts:
#	spring-context/src/main/java/org/springframework/cache/interceptor/CacheAspectSupport.java
This commit is contained in:
Juergen Hoeller
2025-04-04 00:28:50 +02:00
parent 98de16bc50 ee804ee8fb
commit 907c1db7a6
8 changed files with 309 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-webmvc/src/main/java/org/springframework/web/servlet/SmartView.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2024 the original author or authors.
* Copyright 2002-2025 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.
@@ -27,7 +27,6 @@ import java.util.Locale;
*/
public interface SmartView extends View {
/**
* Whether the view performs a redirect.
*/

4
spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ResponseBodyEmitterReturnValueHandler.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2024 the original author or authors.
* Copyright 2002-2025 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.
@@ -404,7 +404,7 @@ public class ResponseBodyEmitterReturnValueHandler implements HandlerMethodRetur
throw ex;
}
catch (Exception ex) {
throw new RuntimeException("Failed to render " + modelAndView, ex);
throw new IllegalStateException("Failed to render " + modelAndView, ex);
}
finally {
RequestContextHolder.resetRequestAttributes();