Return-Path: X-Original-To: apmail-camel-commits-archive@www.apache.org Delivered-To: apmail-camel-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A94B3917C for ; Fri, 24 Feb 2012 15:43:26 +0000 (UTC) Received: (qmail 75542 invoked by uid 500); 24 Feb 2012 15:43:26 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 75511 invoked by uid 500); 24 Feb 2012 15:43:26 -0000 Mailing-List: contact commits-help@camel.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@camel.apache.org Delivered-To: mailing list commits@camel.apache.org Received: (qmail 75503 invoked by uid 99); 24 Feb 2012 15:43:26 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 24 Feb 2012 15:43:26 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 24 Feb 2012 15:43:25 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id CDE4D2388860; Fri, 24 Feb 2012 15:43:05 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1293300 - in /camel/branches/camel-2.9.x: ./ camel-core/src/main/java/org/apache/camel/component/bean/ConstantBeanHolder.java Date: Fri, 24 Feb 2012 15:43:05 -0000 To: commits@camel.apache.org From: davsclaus@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120224154305.CDE4D2388860@eris.apache.org> 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() {