From 8e1c52b3128ff5139b68837f7b41b2b2fe064267 Mon Sep 17 00:00:00 2001 From: Mark Fisher Date: Tue, 5 Aug 2008 15:31:22 +0000 Subject: [PATCH] The MessageExchangeTemplate's receiveAndForward() method now throws the original Exception if it is a MessagingException. If it is not a MessagingException, then it will be wrapped within a new MessagingException (INT-325). --- .../integration/message/MessageExchangeTemplate.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageExchangeTemplate.java b/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageExchangeTemplate.java index 0fb818cafe..80c4a253fd 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageExchangeTemplate.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageExchangeTemplate.java @@ -240,8 +240,8 @@ public class MessageExchangeTemplate implements InitializingBean { return sent; } catch (Exception e) { - MessagingException exception = new MessagingException( - "exception occurred in receive-and-forward exchange", e); + MessagingException exception = (e instanceof MessagingException) ? (MessagingException) e + : new MessagingException("exception occurred in receive-and-forward exchange", e); if (source instanceof MessageDeliveryAware) { ((MessageDeliveryAware) source).onFailure(exception); }