Repository: camel Updated Branches: refs/heads/master 7ebe33322 -> ed7302336
CAMEL-8330: camel-jms - Use 1000 as default receiveTimeout Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ed730233 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ed730233 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ed730233 Branch: refs/heads/master Commit: ed73023364ea369935f5dab889d440b4aadb4c86 Parents: 7ebe333 Author: Claus Ibsen <[email protected]> Authored: Tue Feb 10 14:33:21 2015 +0100 Committer: Claus Ibsen <[email protected]> Committed: Tue Feb 10 14:33:21 2015 +0100 ---------------------------------------------------------------------- .../org/apache/camel/component/jms/JmsConfiguration.java | 11 ++++------- .../apache/camel/component/jms/JmsPollingConsumer.java | 5 +++-- .../component/jms/JmsEndpointConfigurationTest.java | 3 ++- 3 files changed, 9 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/ed730233/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 163d9c9..65350d9 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 @@ -102,10 +102,10 @@ public class JmsConfiguration implements Cloneable { private int cacheLevel = -1; @UriParam private String cacheLevelName; - @UriParam(defaultValue = "-1") - private long recoveryInterval = -1; - @UriParam(defaultValue = "-1") - private long receiveTimeout = -1; + @UriParam(defaultValue = "5000") + private long recoveryInterval = 5000; + @UriParam(defaultValue = "1000") + private long receiveTimeout = 1000; @UriParam(defaultValue = "20000") private long requestTimeout = 20000L; @UriParam(defaultValue = "1000") @@ -422,9 +422,6 @@ public class JmsConfiguration implements Cloneable { template.setPriority(priority); } template.setPubSubNoLocal(pubSubNoLocal); - if (receiveTimeout >= 0) { - template.setReceiveTimeout(receiveTimeout); - } // only set TTL if we have a positive value and it has not been disabled if (timeToLive >= 0 && !isDisableTimeToLive()) { template.setTimeToLive(timeToLive); http://git-wip-us.apache.org/repos/asf/camel/blob/ed730233/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsPollingConsumer.java ---------------------------------------------------------------------- diff --git a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsPollingConsumer.java b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsPollingConsumer.java index 90bfb79..2df30cf 100644 --- a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsPollingConsumer.java +++ b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsPollingConsumer.java @@ -26,7 +26,7 @@ import org.springframework.jms.core.JmsOperations; import org.springframework.jms.core.JmsTemplate; /** - * As the template is created per JmsPollingConsumer, we need to put JmsPollingConsumer into this endpoint + * A JMS {@link org.apache.camel.PollingConsumer}. */ public class JmsPollingConsumer extends PollingConsumerSupport implements ServicePoolAware { private JmsOperations template; @@ -71,10 +71,11 @@ public class JmsPollingConsumer extends PollingConsumerSupport implements Servic } protected void doStart() throws Exception { + // noop } protected void doStop() throws Exception { - + // noop } protected void setReceiveTimeout(long timeout) { http://git-wip-us.apache.org/repos/asf/camel/blob/ed730233/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsEndpointConfigurationTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsEndpointConfigurationTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsEndpointConfigurationTest.java index bda3098..744979e 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsEndpointConfigurationTest.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsEndpointConfigurationTest.java @@ -266,7 +266,8 @@ public class JmsEndpointConfigurationTest extends CamelTestSupport { assertNotNull(endpoint.getCamelContext()); assertNull(endpoint.getDefaultTaskExecutorType()); assertNull(endpoint.getMessageListenerContainerFactory()); - assertEquals(-1, endpoint.getRecoveryInterval()); + assertEquals(5000, endpoint.getRecoveryInterval()); + assertEquals(1000, endpoint.getReceiveTimeout()); assertEquals("JmsConsumer[Foo]", endpoint.getThreadName()); assertEquals(-1, endpoint.getTimeToLive()); assertEquals(-1, endpoint.getTransactionTimeout());
