Merge branch '3.5.x'

Author: philwebb

core/spring-boot/src/main/java/org/springframework/boot/util/LambdaSafe.java

@@ -349,8 +349,10 @@ private static final class GenericTypeFilter<C, A> implements Filter<C, A> {
 		@Override
 		public boolean match(Class<C> callbackType, C callbackInstance, A argument, Object[] additionalArguments) {
 			ResolvableType type = ResolvableType.forClass(callbackType, callbackInstance.getClass());
-			return type.getGenerics().length == 1 && type.resolveGeneric() != null
-					&& type.resolveGeneric().isInstance(argument);
+			if (type.getGenerics().length == 1 && type.resolveGeneric() != null) {
+				return type.resolveGeneric().isInstance(argument);
+			}
+			return true;
 		}
 
 	}