Merge branch '6.0.x'

2023-06-26 19:36:20 +02:00
parent 2ccf4cab8b 6526e79eea
commit 3f40452511
7 changed files with 96 additions and 32 deletions
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/MvcUriComponentsBuilder.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/MvcUriComponentsBuilder.java
@@ -745,8 +745,8 @@ public class MvcUriComponentsBuilder {

 		@Override
 		@Nullable
-		public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
-			return intercept(proxy, method, args, null);
+		public Object invoke(Object proxy, Method method, @Nullable Object[] args) {
+			return intercept(proxy, method, (args != null ? args : new Object[0]), null);
 		}

 		@Override