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 2011/10/09 14:46:45 UTC
svn commit: r1180598 - in /camel/branches/camel-2.8.x: ./
components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/
components/camel-jms/src/test/java/org/apache/camel/component/jms/
Author: davsclaus
Date: Sun Oct 9 12:46:44 2011
New Revision: 1180598
URL: http://svn.apache.org/viewvc?rev=1180598&view=rev
Log:
CAMEL-4530: When useMessageIDAsCorrelationID an timeout occurs due no reply message, then old correlationID is not evicted from dynamic reply selector
Added:
camel/branches/camel-2.8.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutFixedReplyQueueTimeoutTest.java
- copied unchanged from r1180597, camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutFixedReplyQueueTimeoutTest.java
camel/branches/camel-2.8.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutFixedReplyQueueTimeoutUseMessageIDAsCorrelationIDTest.java
- copied unchanged from r1180597, camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutFixedReplyQueueTimeoutUseMessageIDAsCorrelationIDTest.java
Modified:
camel/branches/camel-2.8.x/ (props changed)
camel/branches/camel-2.8.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/PersistentQueueReplyManager.java
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Oct 9 12:46:44 2011
@@ -1 +1 @@
-/camel/trunk:1169608,1178509,1179125,1179198,1180321,1180345,1180557
+/camel/trunk:1169608,1178509,1179125,1179198,1180321,1180345,1180557,1180597
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.8.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/PersistentQueueReplyManager.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/PersistentQueueReplyManager.java?rev=1180598&r1=1180597&r2=1180598&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/PersistentQueueReplyManager.java (original)
+++ camel/branches/camel-2.8.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/PersistentQueueReplyManager.java Sun Oct 9 12:46:44 2011
@@ -67,6 +67,8 @@ public class PersistentQueueReplyManager
// no not arrived early
if (dynamicMessageSelector != null) {
// also remember to keep the dynamic selector updated with the new correlation id
+ // at first removing the old correlationID and then add the new correlationID
+ dynamicMessageSelector.removeCorrelationID(correlationId);
dynamicMessageSelector.addCorrelationID(newCorrelationId);
}
}