From bbc918599157eaa3550731eec39006c27bbd897c Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Fri, 15 Oct 2010 06:59:36 -0400 Subject: [PATCH] INT-1399, modified calls to ConversionService to be in compliance with API changes in Spring 3.0.5 (obviously these changes are good for 3.0.3) --- .../integration/util/MessagingMethodInvokerHelper.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-integration-core/src/main/java/org/springframework/integration/util/MessagingMethodInvokerHelper.java b/spring-integration-core/src/main/java/org/springframework/integration/util/MessagingMethodInvokerHelper.java index 9d91a530e3..f47792d0e2 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/util/MessagingMethodInvokerHelper.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/util/MessagingMethodInvokerHelper.java @@ -181,7 +181,7 @@ public class MessagingMethodInvokerHelper extends AbstractExpressionEvaluator if (method instanceof Method) { context.registerMethodFilter(targetType, new FixedMethodFilter((Method) method)); if (expectedType != null) { - Assert.state(context.getTypeConverter().canConvert(((Method) method).getReturnType(), expectedType), + Assert.state(context.getTypeConverter().canConvert(TypeDescriptor.valueOf(((Method) method).getReturnType()), TypeDescriptor.valueOf(expectedType)), "Cannot convert to expected type (" + expectedType + ") from " + method); } } @@ -202,7 +202,7 @@ public class MessagingMethodInvokerHelper extends AbstractExpressionEvaluator } List methods = filter.filter(Arrays.asList(ReflectionUtils.getAllDeclaredMethods(targetType))); for (Method method : methods) { - if (typeConverter.canConvert(method.getReturnType(), expectedType)) { + if (typeConverter.canConvert(TypeDescriptor.valueOf(method.getReturnType()), TypeDescriptor.valueOf(expectedType))) { return true; } }