Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

INT-1257 removed 'this' from IntegrationObjectSupports message-history writing method

Browse Source
This commit is contained in:
Mark Fisher
2010-07-26 11:42:39 +00:00
parent a06d4b44ee
commit e37d01c5fc
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-integration-jms/src/main/java/org/springframework/integration/jms/ChannelPublishingJmsMessageListener.java
View File

@@ -222,7 +222,7 @@ public class ChannelPublishingJmsMessageListener extends AbstractMessagingGatewa
Message<?> requestMessage = (object instanceof Message<?>) ?
MessageBuilder.fromMessage((Message<?>) object).copyHeaders(headers).build() :
MessageBuilder.withPayload(object).copyHeaders(headers).build();
this.writeMessageHistory(requestMessage, this);
this.writeMessageHistory(requestMessage);
if (!this.expectReply) {
this.send(requestMessage);
}

8
spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsDestinationPollingSource.java
View File

@@ -86,11 +86,13 @@ public class JmsDestinationPollingSource extends AbstractJmsTemplateBasedAdapter
Object convertedObject = converter.fromMessage(jmsMessage);
if (convertedObject instanceof Message) {
convertedMessage = MessageBuilder.fromMessage((Message<Object>) convertedObject).copyHeaders(mappedHeaders).build();
} else {
}
else {
convertedMessage = MessageBuilder.withPayload(convertedObject).build();
}
this.writeMessageHistory(convertedMessage, this);
} catch (Exception e) {
this.writeMessageHistory(convertedMessage);
}
catch (Exception e) {
throw new MessagingException(e.getMessage(), e);
}
return convertedMessage;

2
spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsSendingMessageHandler.java
View File

@@ -62,7 +62,7 @@ public class JmsSendingMessageHandler extends AbstractJmsTemplateBasedAdapter im
if (message == null) {
throw new IllegalArgumentException("message must not be null");
}
this.writeMessageHistory(message, this);
this.writeMessageHistory(message);
this.getJmsTemplate().convertAndSend(message, new MessagePostProcessor() {
public javax.jms.Message postProcessMessage(javax.jms.Message jmsMessage)
throws JMSException {