* Check for void.class as well in the GatewayProxyFactoryBean.isVoidReturnType

artembilan · artembilan · commit 04611adae689 · 2022-10-01T11:58:39.000-04:00
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/gateway/GatewayProxyFactoryBean.java b/spring-integration-core/src/main/java/org/springframework/integration/gateway/GatewayProxyFactoryBean.java
@@ -1099,7 +1099,7 @@ private boolean isVoidReturnType(ResolvableType resolvableType) {
 			if (Future.class.isAssignableFrom(this.returnType) || Mono.class.isAssignableFrom(this.returnType)) {
 				returnTypeToCheck = resolvableType.getGeneric(0).resolve(Object.class);
 			}
-			return Void.class.isAssignableFrom(returnTypeToCheck);
+			return Void.class.isAssignableFrom(returnTypeToCheck) || void.class.isAssignableFrom(returnTypeToCheck);
 		}
 
 		private void setPollable() {

Original file line number	Diff line number	Diff line change
`@@ -1099,7 +1099,7 @@ private boolean isVoidReturnType(ResolvableType resolvableType) {`
`1099`	`1099`	`if (Future.class.isAssignableFrom(this.returnType) \|\| Mono.class.isAssignableFrom(this.returnType)) {`
`1100`	`1100`	`returnTypeToCheck = resolvableType.getGeneric(0).resolve(Object.class);`
`1101`	`1101`	`}`
`1102`		`- return Void.class.isAssignableFrom(returnTypeToCheck);`
	`1102`	`+ return Void.class.isAssignableFrom(returnTypeToCheck) \|\| void.class.isAssignableFrom(returnTypeToCheck);`
`1103`	`1103`	`}`
`1104`	`1104`
`1105`	`1105`	`private void setPollable() {`