Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

INT-1969 ensuring that interface weight results are always odd to offset with even class results. Also fixed typo: 'matchedIntefaces'

Browse Source
This commit is contained in:
Mark Fisher
2011-07-18 09:41:37 -04:00
parent 8ae6d7b842
commit c92d877c24
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
spring-integration-core/src/main/java/org/springframework/integration/router/PayloadTypeRouter.java
View File

@@ -101,19 +101,20 @@ public class PayloadTypeRouter extends AbstractMessageRouter {
if (type.getName().equals(candidate)) {
return level;
}
List<String> matchingIntefaces = new ArrayList<String>();
List<String> matchingInterfaces = new ArrayList<String>();
for (Class<?> iface : type.getInterfaces()) {
if (iface.getName().equals(candidate)) {
matchingIntefaces.add(candidate);
matchingInterfaces.add(candidate);
}
if (matchingIntefaces.size() > 1) {
if (matchingInterfaces.size() > 1) {
throw new IllegalStateException("Found more than one matching interface at the same level of " +
"the hierarchy while attempting to find closest match for [" + type.getName() + "].");
}
if (matchingIntefaces.size() == 1) {
return level + 1;
if (matchingInterfaces.size() == 1) {
// if level is odd, the base type is an interface
return (level % 2 == 1) ? level + 2 : level + 1;
}
// check interface hierarchy
// no match at this level, continue up the hierarchy
for (Class<?> superInterface : iface.getInterfaces()) {
int weight = this.determineTypeDifferenceWeight(candidate, superInterface, level + 3);
if (weight < Integer.MAX_VALUE) {