svn commit: r1365635 - in /camel/branches/camel-2.9.x: ./ camel-core/src/main/java/org/apache/camel/component/bean/RegistryBean.java

[ningjiang]

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