Author: davsclaus
Date: Sat Dec 29 11:52:15 2012
New Revision: 1426749
URL: http://svn.apache.org/viewvc?rev=1426749&view=rev
Log:
CAMEL-5917: Fixed jms polling consumer to use correct timeout values for
receive and receive no wait.
Modified:
camel/branches/camel-2.10.x/ (props changed)
camel/branches/camel-2.10.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsPollingConsumer.java
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1426748
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-2.10.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsPollingConsumer.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsPollingConsumer.java?rev=1426749&r1=1426748&r2=1426749&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsPollingConsumer.java
(original)
+++
camel/branches/camel-2.10.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsPollingConsumer.java
Sat Dec 29 11:52:15 2012
@@ -43,11 +43,11 @@ public class JmsPollingConsumer extends
}
public Exchange receiveNoWait() {
- return receive(1);
+ return receive(JmsTemplate.RECEIVE_TIMEOUT_NO_WAIT);
}
public Exchange receive() {
- return receive(0L);
+ return receive(JmsTemplate.RECEIVE_TIMEOUT_INDEFINITE_WAIT);
}
public Exchange receive(long timeout) {
