camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ra...@apache.org
Subject svn commit: r1459602 - in /camel/branches/camel-2.9.x/components/camel-jms: ./ src/main/java/org/apache/camel/component/jms/reply/ src/test/java/org/apache/camel/component/jms/issues/
Date Fri, 22 Mar 2013 00:33:00 GMT
Author: raulk
Date: Fri Mar 22 00:32:59 2013
New Revision: 1459602

URL: http://svn.apache.org/r1459602
Log:
CAMEL-6123 Fixed camel-jms: InOut exchange can time out even if response was received

Added:
    camel/branches/camel-2.9.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsChainedEndpointDelayTimeout.java
      - copied unchanged from r1459600, camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsChainedEndpointDelayTimeout.java
Modified:
    camel/branches/camel-2.9.x/components/camel-jms/   (props changed)
    camel/branches/camel-2.9.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/PersistentQueueReplyManager.java
    camel/branches/camel-2.9.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/TemporaryQueueReplyManager.java

Propchange: camel/branches/camel-2.9.x/components/camel-jms/
------------------------------------------------------------------------------
  Merged /camel/trunk/components/camel-jms:r1459600

Modified: camel/branches/camel-2.9.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.9.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/PersistentQueueReplyManager.java?rev=1459602&r1=1459601&r2=1459602&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/PersistentQueueReplyManager.java
(original)
+++ camel/branches/camel-2.9.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/PersistentQueueReplyManager.java
Fri Mar 22 00:32:59 2013
@@ -74,11 +74,8 @@ public class PersistentQueueReplyManager
         }
 
         if (handler != null) {
-            try {
-                handler.onReply(correlationID, message);
-            } finally {
-                correlation.remove(correlationID);
-            }
+            correlation.remove(correlationID);
+            handler.onReply(correlationID, message);
         } else {
             // we could not correlate the received reply message to a matching request and
therefore
             // we cannot continue routing the unknown message

Modified: camel/branches/camel-2.9.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.9.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/TemporaryQueueReplyManager.java?rev=1459602&r1=1459601&r2=1459602&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/TemporaryQueueReplyManager.java
(original)
+++ camel/branches/camel-2.9.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/TemporaryQueueReplyManager.java
Fri Mar 22 00:32:59 2013
@@ -66,11 +66,8 @@ public class TemporaryQueueReplyManager 
         }
 
         if (handler != null) {
-            try {
-                handler.onReply(correlationID, message);
-            } finally {
-                correlation.remove(correlationID);
-            }
+            correlation.remove(correlationID);
+            handler.onReply(correlationID, message);
         } else {
             // we could not correlate the received reply message to a matching request and
therefore
             // we cannot continue routing the unknown message



Mime
View raw message