From 8acb89cedde8816cdcf7166727c5139b6587f971 Mon Sep 17 00:00:00 2001 From: Mark Fisher Date: Mon, 19 Jul 2010 17:26:29 +0000 Subject: [PATCH] INT-1229 JMSExceptions caught while attempting to map from JMS properties to MessageHeaders are no longer rethrown (hence no longer fatal) --- .../integration/jms/DefaultJmsHeaderMapper.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/spring-integration-jms/src/main/java/org/springframework/integration/jms/DefaultJmsHeaderMapper.java b/spring-integration-jms/src/main/java/org/springframework/integration/jms/DefaultJmsHeaderMapper.java index 120ff9e9f2..67bd781957 100644 --- a/spring-integration-jms/src/main/java/org/springframework/integration/jms/DefaultJmsHeaderMapper.java +++ b/spring-integration-jms/src/main/java/org/springframework/integration/jms/DefaultJmsHeaderMapper.java @@ -30,7 +30,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.integration.core.MessageHeaders; -import org.springframework.integration.message.MessageMappingException; import org.springframework.util.StringUtils; /** @@ -120,7 +119,7 @@ public class DefaultJmsHeaderMapper implements JmsHeaderMapper { } catch (Exception e) { if (logger.isWarnEnabled()) { - logger.warn("error occurred while mapping properties from MessageHeaders", e); + logger.warn("error occurred while mapping from MessageHeaders to JMS properties", e); } } } @@ -162,7 +161,9 @@ public class DefaultJmsHeaderMapper implements JmsHeaderMapper { } } catch (JMSException e) { - throw new MessageMappingException("failure occurred while mapping JMS properties to MessageHeaders", e); + if (logger.isWarnEnabled()) { + logger.warn("error occurred while mapping from JMS properties to MessageHeaders", e); + } } return headers; }