Consistently determine minimum number of arguments from specified index
Closes gh-25130
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2002-2019 the original author or authors.
|
||||
* Copyright 2002-2020 the original author or authors.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@@ -202,7 +202,6 @@ class ConstructorResolver {
|
||||
LinkedList<UnsatisfiedDependencyException> causes = null;
|
||||
|
||||
for (Constructor<?> candidate : candidates) {
|
||||
|
||||
int parameterCount = candidate.getParameterCount();
|
||||
|
||||
if (constructorToUse != null && argsToUse != null && argsToUse.length > parameterCount) {
|
||||
@@ -515,8 +514,8 @@ class ConstructorResolver {
|
||||
LinkedList<UnsatisfiedDependencyException> causes = null;
|
||||
|
||||
for (Method candidate : candidates) {
|
||||
|
||||
int parameterCount = candidate.getParameterCount();
|
||||
|
||||
if (parameterCount >= minNrOfArgs) {
|
||||
ArgumentsHolder argsHolder;
|
||||
|
||||
@@ -679,7 +678,7 @@ class ConstructorResolver {
|
||||
throw new BeanCreationException(mbd.getResourceDescription(), beanName,
|
||||
"Invalid constructor argument index: " + index);
|
||||
}
|
||||
if (index > minNrOfArgs) {
|
||||
if (index + 1 > minNrOfArgs) {
|
||||
minNrOfArgs = index + 1;
|
||||
}
|
||||
ConstructorArgumentValues.ValueHolder valueHolder = entry.getValue();
|
||||
|
||||
Reference in New Issue
Block a user