If 'extractJmsMessageBody' is true (the default), the body
- * of each received JMS Message will become the payload of a Spring Integration
- * Message. Otherwise, the JMS Message itself will be the payload of the Spring
- * Integration Message.
+ * of each received JMS Message will be converted. Otherwise, the JMS Message
+ * itself will be returned.
*
*
If 'extractIntegrationMessagePayload' is true (the default),
* the payload of each outbound Spring Integration Message will be passed to
* the MessageConverter to produce the body of the JMS Message. Otherwise, the
* Spring Integration Message itself will become the body of the JMS Message.
*
- *
The {@link JmsHeaderMapper} will be applied regardless of the values - * specified for Message extraction. - * * @author Mark Fisher * @author Oleg Zhurakousky */ @@ -60,17 +56,16 @@ public class DefaultMessageConverter implements MessageConverter { /** - * Create a HeaderMappingMessageConverter instance that will rely on the - * default {@link SimpleMessageConverter} and {@link DefaultJmsHeaderMapper}. + * Create a DefaultMessageConverter instance that will rely on the + * default {@link SimpleMessageConverter}. */ public DefaultMessageConverter() { this(null); } /** - * Create a HeaderMappingMessageConverter instance that will delegate to - * the provided {@link MessageConverter} instance and will use the default - * implementation of the {@link JmsHeaderMapper} strategy. + * Create a DefaultMessageConverter instance that will delegate to + * the provided {@link MessageConverter} instance. */ public DefaultMessageConverter(MessageConverter converter) { this.converter = (converter != null ? converter : new SimpleMessageConverter()); @@ -79,8 +74,7 @@ public class DefaultMessageConverter implements MessageConverter { /** * Specify whether the inbound JMS Message's body should be extracted * during the conversion process. Otherwise, the raw JMS Message itself - * will be the payload of the created Spring Integration Message. The - * HeaderMapper will be applied to the Message regardless of this value. + * will be returned to be used as the payload. * *
The default value is true.
*/
@@ -109,30 +103,25 @@ public class DefaultMessageConverter implements MessageConverter {
}
/**
- * Converts from a JMS {@link javax.jms.Message} to an integration Message.
+ * Converts from a JMS {@link javax.jms.Message} to an integration Message payload.
+ * If the 'extractJmsMessageBody' property is false, the JMS Message itself
+ * will be returned to be used as the payload.
*/
public Object fromMessage(javax.jms.Message jmsMessage) throws JMSException, MessageConversionException {
- MessageBuilder builder = null;
+ Object result = null;
if (this.extractJmsMessageBody) {
- Object conversionResult = this.converter.fromMessage(jmsMessage);
- if (conversionResult == null) {
- return null;
- }
- if (conversionResult instanceof Message) {
- builder = MessageBuilder.fromMessage((Message) conversionResult);
- }
- else {
- builder = MessageBuilder.withPayload(conversionResult);
+ result = this.converter.fromMessage(jmsMessage);
+ if (logger.isDebugEnabled()) {
+ logger.debug("converted JMS Message [" + jmsMessage + "] to integration Message payload [" + result + "]");
}
}
else {
- builder = MessageBuilder.withPayload(jmsMessage);
+ result = jmsMessage;
+ if (logger.isDebugEnabled()) {
+ logger.debug("returning JMS Message [" + jmsMessage + "] as the Message payload.");
+ }
}
- Message message = builder.build();
- if (logger.isDebugEnabled()) {
- logger.debug("converted JMS Message [" + jmsMessage + "] to integration Message [" + message + "]");
- }
- return message;
+ return result;
}
/**
@@ -146,7 +135,6 @@ public class DefaultMessageConverter implements MessageConverter {
}
}
jmsMessage = this.converter.toMessage(object, session);
-
if (logger.isDebugEnabled()) {
logger.debug("converted [" + object + "] to JMS Message [" + jmsMessage + "]");
}
diff --git a/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsDestinationPollingSource.java b/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsDestinationPollingSource.java
index eb149f41b8..08ee415575 100644
--- a/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsDestinationPollingSource.java
+++ b/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsDestinationPollingSource.java
@@ -84,12 +84,9 @@ public class JmsDestinationPollingSource extends AbstractJmsTemplateBasedAdapter
Map