camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1144434 - in /camel/branches/camel-2.7.x: ./ camel-core/src/main/java/org/apache/camel/component/bean/RegistryBean.java
Date Fri, 08 Jul 2011 19:26:49 GMT
Author: dkulp
Date: Fri Jul  8 19:26:48 2011
New Revision: 1144434

URL: http://svn.apache.org/viewvc?rev=1144434&view=rev
Log:
Merged revisions 1086165 via svnmerge from 
https://svn.apache.org/repos/asf/camel/trunk

........
  r1086165 | davsclaus | 2011-03-28 05:38:23 -0400 (Mon, 28 Mar 2011) | 1 line
  
  CAMEL-3812: Fixed issue with resetting BeanInfo if bean has changed
........

Modified:
    camel/branches/camel-2.7.x/   (props changed)
    camel/branches/camel-2.7.x/camel-core/src/main/java/org/apache/camel/component/bean/RegistryBean.java

Propchange: camel/branches/camel-2.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul  8 19:26:48 2011
@@ -1 +1 @@
-/camel/trunk:1083696,1083723-1083724,1084150,1085277,1085543,1085549,1085905,1085909,1086231,1087005,1087276,1087612,1087856,1088583,1088916-1088917,1089275,1089348,1090166,1090960-1090969,1091518,1091771,1091799,1092068,1092577,1092667,1093978,1094147,1094156,1095405,1095469,1095471,1095475-1095476,1096346,1097909,1097912,1097978,1098630,1099417,1100975,1102162,1102181,1104076,1124497,1127744,1127988,1131411,1134252,1134501,1135223,1135364,1136290,1138285,1139163,1140096-1140102,1141783,1143925,1144248,1144324
+/camel/trunk:1083696,1083723-1083724,1084150,1085277,1085543,1085549,1085905,1085909,1086165,1086231,1087005,1087276,1087612,1087856,1088583,1088916-1088917,1089275,1089348,1090166,1090960-1090969,1091518,1091771,1091799,1092068,1092577,1092667,1093978,1094147,1094156,1095405,1095469,1095471,1095475-1095476,1096346,1097909,1097912,1097978,1098630,1099417,1100975,1102162,1102181,1104076,1124497,1127744,1127988,1131411,1134252,1134501,1135223,1135364,1136290,1138285,1139163,1140096-1140102,1141783,1143925,1144248,1144324

Modified: camel/branches/camel-2.7.x/camel-core/src/main/java/org/apache/camel/component/bean/RegistryBean.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/camel-core/src/main/java/org/apache/camel/component/bean/RegistryBean.java?rev=1144434&r1=1144433&r2=1144434&view=diff
==============================================================================
--- camel/branches/camel-2.7.x/camel-core/src/main/java/org/apache/camel/component/bean/RegistryBean.java
(original)
+++ camel/branches/camel-2.7.x/camel-core/src/main/java/org/apache/camel/component/bean/RegistryBean.java
Fri Jul  8 19:26:48 2011
@@ -69,11 +69,11 @@ public class RegistryBean implements Bea
             }
         }
         if (value != bean) {
-            bean = value;
-            processor = null;
             if (!ObjectHelper.equal(ObjectHelper.type(bean), ObjectHelper.type(value))) {
                 beanInfo = null;
             }
+            bean = value;
+            processor = null;
 
             // could be a class then create an instance of it
             if (bean instanceof Class) {



Mime
View raw message