Skip to content

Commit 6f65b63

Browse files
committed
Defensive resolution of getParameterType (actually never returning null)
Covers use of ResolvableType in overridden getParameterType variants. Issue: SPR-16072
1 parent 97c6385 commit 6f65b63

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/InvocableHandlerMethod.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ public Class<?> getParameterType() {
280280
return this.returnValue.getClass();
281281
}
282282
if (!ResolvableType.NONE.equals(this.returnType)) {
283-
return this.returnType.resolve();
283+
return this.returnType.resolve(Object.class);
284284
}
285285
return super.getParameterType();
286286
}

spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethod.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ public Class<?> getParameterType() {
263263
return this.returnValue.getClass();
264264
}
265265
if (!ResolvableType.NONE.equals(this.returnType)) {
266-
return this.returnType.resolve();
266+
return this.returnType.resolve(Object.class);
267267
}
268268
return super.getParameterType();
269269
}

0 commit comments

Comments
 (0)