Repository: camel Updated Branches: refs/heads/camel-2.16.x f06c7995b -> 2451f0636 refs/heads/master 9dc14070c -> ebd93ccf3
Component docs. Fixed test Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ebd93ccf Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ebd93ccf Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ebd93ccf Branch: refs/heads/master Commit: ebd93ccf3a1b11525ce1ec29c1de79512216045b Parents: 9dc1407 Author: Claus Ibsen <davscl...@apache.org> Authored: Sat Jan 16 11:50:12 2016 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Sat Jan 16 11:50:12 2016 +0100 ---------------------------------------------------------------------- .../main/java/org/apache/camel/component/jms/JmsComponent.java | 4 ++++ .../java/org/apache/camel/component/jms/JmsConfiguration.java | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/ebd93ccf/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsComponent.java ---------------------------------------------------------------------- diff --git a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsComponent.java b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsComponent.java index 8d5982c..46ef75d 100644 --- a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsComponent.java +++ b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsComponent.java @@ -891,6 +891,10 @@ public class JmsComponent extends UriEndpointComponent implements ApplicationCon MessageListenerContainerFactory messageListenerContainerFactory = resolveAndRemoveReferenceParameter(parameters, "messageListenerContainerFactoryRef", MessageListenerContainerFactory.class); + if (messageListenerContainerFactory == null) { + messageListenerContainerFactory = resolveAndRemoveReferenceParameter(parameters, + "messageListenerContainerFactory", MessageListenerContainerFactory.class); + } if (messageListenerContainerFactory != null) { endpoint.setMessageListenerContainerFactory(messageListenerContainerFactory); } http://git-wip-us.apache.org/repos/asf/camel/blob/ebd93ccf/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java ---------------------------------------------------------------------- diff --git a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java index b516408..ce13961 100644 --- a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java +++ b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java @@ -493,7 +493,7 @@ public class JmsConfiguration implements Cloneable { * The consumer type to use, which can be one of: Simple, Default, or Custom. * The consumer type determines which Spring JMS listener to use. Default will use org.springframework.jms.listener.DefaultMessageListenerContainer, * Simple will use org.springframework.jms.listener.SimpleMessageListenerContainer. - * When Custom is specified, the MessageListenerContainerFactory defined by the messageListenerContainerFactoryRef option + * When Custom is specified, the MessageListenerContainerFactory defined by the messageListenerContainerFactory option * will determine what org.springframework.jms.listener.AbstractMessageListenerContainer to use. */ public void setConsumerType(ConsumerType consumerType) {
