You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2012/02/24 16:43:05 UTC
svn commit: r1293300 - in /camel/branches/camel-2.9.x: ./
camel-core/src/main/java/org/apache/camel/component/bean/ConstantBeanHolder.java
Author: davsclaus
Date: Fri Feb 24 15:43:05 2012
New Revision: 1293300
URL: http://svn.apache.org/viewvc?rev=1293300&view=rev
Log:
CAMEL-5036: Avoid calling toString on bean in bean holder, as it may be a remote proxy.
Modified:
camel/branches/camel-2.9.x/ (props changed)
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/component/bean/ConstantBeanHolder.java
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 24 15:43:05 2012
@@ -1 +1 @@
-/camel/trunk:1243046,1243057,1243234,1244518,1244644,1244859,1244861,1244864,1244870,1244872,1245021,1291555,1291727,1291848,1291864,1292114,1292384,1292725,1292760,1292767,1293079,1293268
+/camel/trunk:1243046,1243057,1243234,1244518,1244644,1244859,1244861,1244864,1244870,1244872,1245021,1291555,1291727,1291848,1291864,1292114,1292384,1292725,1292760,1292767,1293079,1293268,1293288
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/component/bean/ConstantBeanHolder.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/component/bean/ConstantBeanHolder.java?rev=1293300&r1=1293299&r2=1293300&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/component/bean/ConstantBeanHolder.java (original)
+++ camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/component/bean/ConstantBeanHolder.java Fri Feb 24 15:43:05 2012
@@ -50,7 +50,8 @@ public class ConstantBeanHolder implemen
@Override
public String toString() {
- return bean.toString();
+ // avoid invoke toString on bean as it may be a remote proxy
+ return ObjectHelper.className(bean) + "(" + ObjectHelper.getIdentityHashCode(bean) + ")";
}
public Object getBean() {