Author: davsclaus
Date: Mon Mar 4 16:44:13 2013
New Revision: 1452383
URL: http://svn.apache.org/r1452383
Log:
CAMEL-6127: Fixed not possible to use custom inflight registry in XML due
copy/paste mistake. Thanks to PhilippJ for spotting this.
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/AbstractCamelContextFactoryBean.java
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1452377
Merged /camel/branches/camel-2.10.x:r1452380
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/AbstractCamelContextFactoryBean.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/AbstractCamelContextFactoryBean.java?rev=1452383&r1=1452382&r2=1452383&view=diff
==============================================================================
---
camel/branches/camel-2.9.x/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
(original)
+++
camel/branches/camel-2.9.x/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
Mon Mar 4 16:44:13 2013
@@ -182,7 +182,7 @@ public abstract class AbstractCamelConte
getContext().addInterceptStrategy(delayer);
}
InflightRepository inflightRepository =
getBeanForType(InflightRepository.class);
- if (delayer != null) {
+ if (inflightRepository != null) {
LOG.info("Using custom InflightRepository: " + inflightRepository);
getContext().setInflightRepository(inflightRepository);
}