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

INT-901 removed ReplyMessageHolder and refactored AbstractReplyProducingMessageHandler accordingly

Browse Source
This commit is contained in:
Mark Fisher
2009-12-02 02:37:51 +00:00
parent 40f80d96cb
commit 4a13e38fde
17 changed files with 118 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/AbstractRemotingOutboundGateway.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2008 the original author or authors.
* Copyright 2002-2009 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -21,7 +21,6 @@ import java.io.Serializable;
import org.springframework.integration.core.Message;
import org.springframework.integration.core.MessageChannel;
import org.springframework.integration.handler.AbstractReplyProducingMessageHandler;
import org.springframework.integration.handler.ReplyMessageHolder;
import org.springframework.integration.message.MessageBuilder;
import org.springframework.integration.message.MessageHandlingException;
import org.springframework.remoting.RemoteAccessException;
@@ -52,7 +51,7 @@ public abstract class AbstractRemotingOutboundGateway extends AbstractReplyProdu
@Override
public final void handleRequestMessage(Message<?> message, ReplyMessageHolder replyHolder) {
public final Object handleRequestMessage(Message<?> message) {
if (!(message.getPayload() instanceof Serializable)) {
throw new MessageHandlingException(message,
this.getClass().getName() + " expects a Serializable payload type " +
@@ -60,10 +59,7 @@ public abstract class AbstractRemotingOutboundGateway extends AbstractReplyProdu
}
Message<?> requestMessage = MessageBuilder.fromMessage(message).build();
try {
Message<?> reply = this.handlerProxy.handle(requestMessage);
if (reply != null) {
replyHolder.set(reply);
}
return this.handlerProxy.handle(requestMessage);
}
catch (RemoteAccessException e) {
throw new MessageHandlingException(message, "unable to handle message remotely", e);