Repository: cxf Updated Branches: refs/heads/3.0.x-fixes 5321861b2 -> 4d8d30f19
[CXF-5754] Make sure temp queues are closed Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/034fac66 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/034fac66 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/034fac66 Branch: refs/heads/3.0.x-fixes Commit: 034fac66c7e42e240631059506a0668920f5b53a Parents: 5321861 Author: Christian Schneider <[email protected]> Authored: Wed Mar 15 10:25:34 2017 +0100 Committer: Christian Schneider <[email protected]> Committed: Wed Mar 15 14:04:14 2017 +0100 ---------------------------------------------------------------------- .../main/java/org/apache/cxf/transport/jms/JMSConduit.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/034fac66/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java ---------------------------------------------------------------------- diff --git a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java index 485c27d..e6d6da2 100644 --- a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java +++ b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java @@ -218,14 +218,17 @@ public class JMSConduit extends AbstractConduit implements JMSExchangeSender, Me correlationMap.put(correlationId, exchange); } - if (exchange.isSynchronous()) { + if (!exchange.isSynchronous()) { + return; + } + + try { if (useSyncReceive) { // TODO Not sure if replyToDestination is correct here javax.jms.Message replyMessage = JMSUtil.receive(session, replyToDestination, correlationId, jmsConfig.getReceiveTimeout(), jmsConfig.isPubSubNoLocal()); - correlationMap.remove(correlationId); processReplyMessage(exchange, replyMessage); } else { try { @@ -239,6 +242,8 @@ public class JMSConduit extends AbstractConduit implements JMSExchangeSender, Me } } + } finally { + correlationMap.remove(correlationId); } } }
