svn commit: r948371 - /camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java

[davsclaus]

Author: davsclaus
Date: Wed May 26 09:15:28 2010
New Revision: 948371

URL: http://svn.apache.org/viewvc?rev=948371&view=rev
Log:
CAMEL-2750: Fixed issue with CGLib enhanced beans being invoked from camel bean.

Modified:
    
camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java

Modified: 
camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java?rev=948371&r1=948370&r2=948371&view=diff
==============================================================================
--- 
camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
 (original)
+++ 
camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
 Wed May 26 09:15:28 2010
@@ -665,8 +665,11 @@ public class BeanInfo {
     }
 
     private static Class<?> getTargetClass(Class<?> clazz) {
-        if (clazz.getName().indexOf(CGLIB_CLASS_SEPARATOR) != -1) {
-            return clazz.getSuperclass();
+        if (clazz != null && clazz.getName().contains(CGLIB_CLASS_SEPARATOR)) {
+            Class<?> superClass = clazz.getSuperclass();
+            if (superClass != null && !Object.class.equals(superClass)) {
+                return superClass;
+            }
         }
         return clazz;
     }