You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2012/12/29 12:53:19 UTC
svn commit: r1426750 - in /camel/branches/camel-2.9.x: ./
components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsPollingConsumer.java
Author: davsclaus
Date: Sat Dec 29 11:53:19 2012
New Revision: 1426750
URL: http://svn.apache.org/viewvc?rev=1426750&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.9.x/ (props changed)
camel/branches/camel-2.9.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsPollingConsumer.java
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1426748
Merged /camel/branches/camel-2.10.x:r1426749
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.9.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsPollingConsumer.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsPollingConsumer.java?rev=1426750&r1=1426749&r2=1426750&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsPollingConsumer.java (original)
+++ camel/branches/camel-2.9.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsPollingConsumer.java Sat Dec 29 11:53:19 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) {