root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

changed vis of arg conversion code so function calls can use it

This commit is contained in:
Andy Clement 2008-08-18 22:35:21 +00:00
parent ec9cb8565b
commit 2fbb7ad327
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
org.springframework.expression/src/main/java/org/springframework/expression/spel/reflection/ReflectionUtils.java
View File

@ -471,7 +471,7 @@ public class ReflectionUtils {
} }
} }
static void convertArguments(Class[] parameterTypes, boolean isVarargs, TypeConverter converter, public static void convertArguments(Class[] parameterTypes, boolean isVarargs, TypeConverter converter,
Object... arguments) throws EvaluationException { Object... arguments) throws EvaluationException {
Class varargsType = null; Class varargsType = null;
if (isVarargs) { if (isVarargs) {
@ -484,13 +484,21 @@ public class ReflectionUtils {
} else { } else {
targetType = parameterTypes[i]; targetType = parameterTypes[i];
} }
if (converter==null) {
throw new SpelException(SpelMessages.PROBLEM_DURING_TYPE_CONVERSION, "No converter available to convert '"
+ arguments[i] + " to type '" + targetType + "'");
}
try { try {
if (arguments[i] != null && arguments[i].getClass() != targetType) { if (arguments[i] != null && arguments[i].getClass() != targetType) {
arguments[i] = converter.convertValue(arguments[i], targetType); arguments[i] = converter.convertValue(arguments[i], targetType);
} }
} catch (EvaluationException e) { } catch (EvaluationException e) {
// allows for another type converter throwing a different kind of EvaluationException
if (!(e instanceof SpelException)) {
throw new SpelException(e, SpelMessages.PROBLEM_DURING_TYPE_CONVERSION, "Converter failed to convert '" throw new SpelException(e, SpelMessages.PROBLEM_DURING_TYPE_CONVERSION, "Converter failed to convert '"
+ arguments[i] + " to type '" + targetType + "'"); + arguments[i].getClass().getName() + "' to type '" + targetType + "'");
}
throw e;
} }
} }
} }
@ -505,7 +513,7 @@ public class ReflectionUtils {
* @param arguments the arguments to be setup ready for the invocation * @param arguments the arguments to be setup ready for the invocation
* @return a repackaged array of arguments where any varargs setup has been done * @return a repackaged array of arguments where any varargs setup has been done
*/ */
static Object[] setupArgumentsForVarargsInvocation(Class[] parameterTypes, Object... arguments) { public static Object[] setupArgumentsForVarargsInvocation(Class[] parameterTypes, Object... arguments) {
// Check if array already built for final argument // Check if array already built for final argument
int nParams = parameterTypes.length; int nParams = parameterTypes.length;
int nArgs = arguments.length; int nArgs = arguments.length;