Author: davsclaus
Date: Thu May 24 16:21:59 2012
New Revision: 1342318
URL: http://svn.apache.org/viewvc?rev=1342318&view=rev
Log:
Blueprint namespace should lookup default blueprint camelcontext if not explict
configured in the namespace.
Modified:
camel/branches/camel-2.9.x/ (props changed)
camel/branches/camel-2.9.x/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelFactoryBean.java
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1342317
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-2.9.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.9.x/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelFactoryBean.java?rev=1342318&r1=1342317&r2=1342318&view=diff
==============================================================================
---
camel/branches/camel-2.9.x/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelFactoryBean.java
(original)
+++
camel/branches/camel-2.9.x/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelFactoryBean.java
Thu May 24 16:21:59 2012
@@ -53,8 +53,6 @@ public abstract class AbstractCamelFacto
}
public CamelContext getCamelContext() {
- // when getting CamelContext then we assume it must exists
-
if (camelContext == null && camelContextId != null) {
camelContext = getCamelContextWithId(camelContextId);
if (camelContext == null) {
