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 E5958D4D9 for ; Wed, 25 Jul 2012 15:32:45 +0000 (UTC) Received: (qmail 29399 invoked by uid 500); 25 Jul 2012 15:32:45 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 29363 invoked by uid 500); 25 Jul 2012 15:32:45 -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 29350 invoked by uid 99); 25 Jul 2012 15:32:44 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 25 Jul 2012 15:32:44 +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; Wed, 25 Jul 2012 15:32:43 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 7435323889BB; Wed, 25 Jul 2012 15:32:00 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1365635 - in /camel/branches/camel-2.9.x: ./ camel-core/src/main/java/org/apache/camel/component/bean/RegistryBean.java Date: Wed, 25 Jul 2012 15:32:00 -0000 To: commits@camel.apache.org From: ningjiang@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120725153200.7435323889BB@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ningjiang Date: Wed Jul 25 15:32:00 2012 New Revision: 1365635 URL: http://svn.apache.org/viewvc?rev=1365635&view=rev Log: Merged revisions 1365629 via svnmerge from https://svn.apache.org/repos/asf/camel/branches/camel-2.10.x ................ r1365629 | ningjiang | 2012-07-25 23:25:48 +0800 (Wed, 25 Jul 2012) | 9 lines Merged revisions 1365616 via svnmerge from https://svn.apache.org/repos/asf/camel/trunk ........ r1365616 | ningjiang | 2012-07-25 23:12:47 +0800 (Wed, 25 Jul 2012) | 1 line CAMEL-5468 Fix a thread safe issue of RegistryBean ........ ................ 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/RegistryBean.java Propchange: camel/branches/camel-2.9.x/ ------------------------------------------------------------------------------ Merged /camel/trunk:r1365616 Merged /camel/branches/camel-2.10.x:r1365629 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/RegistryBean.java URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/component/bean/RegistryBean.java?rev=1365635&r1=1365634&r2=1365635&view=diff ============================================================================== --- camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/component/bean/RegistryBean.java (original) +++ camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/component/bean/RegistryBean.java Wed Jul 25 15:32:00 2012 @@ -58,7 +58,7 @@ public class RegistryBean implements Bea return new ConstantBeanHolder(getBean(), getBeanInfo()); } - public Object getBean() throws NoSuchBeanException { + public synchronized Object getBean() throws NoSuchBeanException { Object value = lookupBean(); if (value == null) { // maybe its a class