Author: davsclaus
Date: Tue Jul 26 16:18:02 2011
New Revision: 1151153
URL: http://svn.apache.org/viewvc?rev=1151153&view=rev
Log:
Fixed CS
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanHelper.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanHelper.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanHelper.java?rev=1151153&r1=1151152&r2=1151153&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanHelper.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanHelper.java
Tue Jul 26 16:18:02 2011
@@ -100,21 +100,17 @@ public final class BeanHelper {
// if its a class, then it should be assignable
Class<?> parameterClass = resolver.resolveClass(parameterType);
if (parameterClass == null &&
parameterType.equals(expectedType.getSimpleName())) {
- // it was not the FQN class name, but the simple name instead, so
we can infer the type
- parameterClass = expectedType;
+ // it was not the FQN class name, but the simple name instead,
which matched
+ return true;
}
- // if there was a class, then it must be assignable to match
- if (parameterClass != null) {
- if (!parameterClass.isAssignableFrom(expectedType)) {
- return false;
- } else {
- return true;
- }
+ // not a class so return null
+ if (parameterClass == null) {
+ return null;
}
- // not a class so return null
- return null;
+ // if there was a class, then it must be assignable to match
+ return parameterClass.isAssignableFrom(expectedType);
}
}