Author: raulk
Date: Sun Nov 4 23:31:18 2012
New Revision: 1405675
URL: http://svn.apache.org/viewvc?rev=1405675&view=rev
Log:
Backported to 2.10.x. CAMEL-5769: Camel JMS producer can block a thread under
specific circumstances. Corrected a log message.
Added:
camel/branches/camel-2.10.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsBlockedAsyncRoutingEngineTest.java
- copied unchanged from r1405662,
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsBlockedAsyncRoutingEngineTest.java
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/reply/TemporaryQueueReplyManager.java
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1405662
Modified:
camel/branches/camel-2.10.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/TemporaryQueueReplyManager.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/TemporaryQueueReplyManager.java?rev=1405675&r1=1405674&r2=1405675&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/TemporaryQueueReplyManager.java
(original)
+++
camel/branches/camel-2.10.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/TemporaryQueueReplyManager.java
Sun Nov 4 23:31:18 2012
@@ -53,7 +53,9 @@ public class TemporaryQueueReplyManager
log.trace("Updated provisional correlationId [{}] to expected
correlationId [{}]", correlationId, newCorrelationId);
ReplyHandler handler = correlation.remove(correlationId);
- correlation.put(newCorrelationId, handler, requestTimeout);
+ if (handler != null) {
+ correlation.put(newCorrelationId, handler, requestTimeout);
+ }
}
@Override
