svn commit: r1199685 - in /camel/branches/camel-2.8.x: ./ camel-core/src/main/java/org/apache/camel/component/bean/ camel-core/src/test/java/org/apache/camel/component/bean/

[davsclaus]

Author: davsclaus
Date: Wed Nov  9 10:19:47 2011
New Revision: 1199685

URL: http://svn.apache.org/viewvc?rev=1199685&view=rev
Log:
CAMEL-4647: Allow toString as method in bean component.

Added:
    
camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/component/bean/BeanInvokeSimpleOgnlToStringMethodTest.java
      - copied unchanged from r1199683, 
camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanInvokeSimpleOgnlToStringMethodTest.java
    
camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/component/bean/BeanInvokeToStringMethodTest.java
      - copied unchanged from r1199683, 
camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanInvokeToStringMethodTest.java
Modified:
    camel/branches/camel-2.8.x/   (props changed)
    
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
    
camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/component/bean/BeanExcludedMethodTest.java

Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov  9 10:19:47 2011
@@ -1 +1 @@
-/camel/trunk:1186106,1186625,1186772,1187221,1187485,1187882,1187893,1188070-1188085,1188642,1188674,1188879,1188881,1189139,1189600,1189681,1189693,1189737,1190212-1190213,1190246,1190303,1195317,1195616,1196210,1197450,1197933,1197948,1198199,1198338,1198340,1199123,1199137
+/camel/trunk:1186106,1186625,1186772,1187221,1187485,1187882,1187893,1188070-1188085,1188642,1188674,1188879,1188881,1189139,1189600,1189681,1189693,1189737,1190212-1190213,1190246,1190303,1195317,1195616,1196210,1197450,1197933,1197948,1198199,1198338,1198340,1199123,1199137,1199683

Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java?rev=1199685&r1=1199684&r2=1199685&view=diff
==============================================================================
--- 
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
 (original)
+++ 
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
 Wed Nov  9 10:19:47 2011
@@ -80,6 +80,13 @@ public class BeanInfo {
         EXCLUDED_METHODS.addAll(Arrays.asList(Object.class.getMethods()));
         // exclude all java.lang.reflect.Proxy methods as we dont want to 
invoke them
         EXCLUDED_METHODS.addAll(Arrays.asList(Proxy.class.getMethods()));
+        try {
+            // but keep toString as this method is okay
+            EXCLUDED_METHODS.remove(Object.class.getMethod("toString"));
+            EXCLUDED_METHODS.remove(Proxy.class.getMethod("toString"));
+        } catch (Throwable e) {
+            // ignore
+        }
     }
 
     public BeanInfo(CamelContext camelContext, Class<?> type) {

Modified: 
camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/component/bean/BeanExcludedMethodTest.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/component/bean/BeanExcludedMethodTest.java?rev=1199685&r1=1199684&r2=1199685&view=diff
==============================================================================
--- 
camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/component/bean/BeanExcludedMethodTest.java
 (original)
+++ 
camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/component/bean/BeanExcludedMethodTest.java
 Wed Nov  9 10:19:47 2011
@@ -57,10 +57,6 @@ public class BeanExcludedMethodTest exte
             return super.hashCode();
         }
 
-        @Override
-        public String toString() {
-            return "dummy";
-        }
     }
 
     public static class MyOtherDummyBean {