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:50:15 UTC
svn commit: r1180600 - in /camel/branches/camel-2.7.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:50:15 2011
New Revision: 1180600
URL: http://svn.apache.org/viewvc?rev=1180600&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.7.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutFixedReplyQueueTimeoutTest.java
- copied unchanged from r1180598, camel/branches/camel-2.8.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutFixedReplyQueueTimeoutTest.java
camel/branches/camel-2.7.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutFixedReplyQueueTimeoutUseMessageIDAsCorrelationIDTest.java
- copied unchanged from r1180598, camel/branches/camel-2.8.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutFixedReplyQueueTimeoutUseMessageIDAsCorrelationIDTest.java
Modified:
camel/branches/camel-2.7.x/ (props changed)
camel/branches/camel-2.7.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/PersistentQueueReplyManager.java
Propchange: camel/branches/camel-2.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Oct 9 12:50:15 2011
@@ -1,2 +1,2 @@
-/camel/branches/camel-2.8.x:1174571,1175323,1176329,1176787,1177397,1177946,1177949
-/camel/trunk:1146608,1146903,1147216,1174565,1175321,1176274,1176781-1176782,1177394,1177945,1177948
+/camel/branches/camel-2.8.x:1174571,1175323,1176329,1176787,1177397,1177946,1177949,1180598
+/camel/trunk:1146608,1146903,1147216,1174565,1175321,1176274,1176781-1176782,1177394,1177945,1177948,1180597
Propchange: camel/branches/camel-2.7.x/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sun Oct 9 12:50:15 2011
@@ -1 +1 @@
-/camel/branches/camel-2.8.x:1-1146127,1146608,1146653,1146771,1146903,1147216,1174571,1175323,1176329,1176787,1177397,1177946,1177949
+/camel/branches/camel-2.8.x:1-1146127,1146608,1146653,1146771,1146903,1147216,1174571,1175323,1176329,1176787,1177397,1177946,1177949,1180598
Modified: camel/branches/camel-2.7.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.7.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/PersistentQueueReplyManager.java?rev=1180600&r1=1180599&r2=1180600&view=diff
==============================================================================
--- camel/branches/camel-2.7.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/PersistentQueueReplyManager.java (original)
+++ camel/branches/camel-2.7.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/PersistentQueueReplyManager.java Sun Oct 9 12:50:15 2011
@@ -68,6 +68,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);
}
}