Author: davsclaus
Date: Thu Sep 27 11:37:42 2012
New Revision: 1390947
URL: http://svn.apache.org/viewvc?rev=1390947&view=rev
Log:
CAMEL-5655: Fixed endpoint factorty bean when using multiple camel contexts.
Added:
camel/branches/camel-2.10.x/components/camel-spring/src/test/java/org/apache/camel/spring/config/DualCamelContextEndpointOutsideTest.java
- copied unchanged from r1390946,
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/DualCamelContextEndpointOutsideTest.java
camel/branches/camel-2.10.x/components/camel-spring/src/test/resources/org/apache/camel/spring/config/DualCamelContextEndpointOutsideTest.xml
- copied unchanged from r1390946,
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/config/DualCamelContextEndpointOutsideTest.xml
Modified:
camel/branches/camel-2.10.x/ (props changed)
camel/branches/camel-2.10.x/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelFactoryBean.java
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1390946
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-2.10.x/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelFactoryBean.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelFactoryBean.java?rev=1390947&r1=1390946&r2=1390947&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelFactoryBean.java
(original)
+++
camel/branches/camel-2.10.x/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelFactoryBean.java
Thu Sep 27 11:37:42 2012
@@ -63,6 +63,10 @@ public abstract class AbstractCamelFacto
}
public CamelContext getCamelContext() {
+ if (ObjectHelper.isNotEmpty(camelContextId)) {
+ // always return the context by its id
+ return getCamelContextWithId(camelContextId);
+ }
return camelContext;
}