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/2451f063 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2451f063 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2451f063 Branch: refs/heads/camel-2.16.x Commit: 2451f06363e42b2bdc56e9fd01f260cc4ba5b50e Parents: f06c799 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:36 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/2451f063/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 e13eecb..8e0cd61 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 @@ -879,6 +879,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/2451f063/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 2057ae4..510765b 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 @@ -491,7 +491,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) {
