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

Removed the 'targetChannel' from ReplyMessageHolder for now (not being used yet) and made CronSequenceGenerator package protected for now.

Browse Source
This commit is contained in:
Mark Fisher
2008-11-26 15:56:15 +00:00
parent 2c2a1be8ae
commit 9ffc1a08c3
3 changed files with 2 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
org.springframework.integration/src/main/java/org/springframework/integration/handler/AbstractReplyProducingMessageHandler.java
View File

@@ -98,14 +98,7 @@ public abstract class AbstractReplyProducingMessageHandler extends AbstractMessa
}
return;
}
Object targetChannelValue = replyMessageHolder.getTargetChannel();
MessageChannel replyChannel = null;
if (targetChannelValue == null) {
replyChannel = this.resolveReplyChannel(message);
}
else if (targetChannelValue instanceof String) {
replyChannel = this.channelResolver.resolveChannelName((String) targetChannelValue);
}
MessageChannel replyChannel = this.resolveReplyChannel(message);
MessageHeaders requestHeaders = message.getHeaders();
for (MessageBuilder<?> builder : replyMessageHolder.builders()) {
builder.copyHeadersIfAbsent(requestHeaders);

15
org.springframework.integration/src/main/java/org/springframework/integration/handler/ReplyMessageHolder.java
View File

@@ -21,7 +21,6 @@ import java.util.Collections;
import java.util.List;
import org.springframework.integration.core.Message;
import org.springframework.integration.core.MessageChannel;
import org.springframework.integration.message.MessageBuilder;
/**
@@ -31,8 +30,6 @@ public class ReplyMessageHolder {
private final List<MessageBuilder<?>> builders = new ArrayList<MessageBuilder<?>>();
private volatile Object targetChannel;
public MessageBuilder<?> set(Object messageOrPayload) {
return this.createAndAddBuilder(messageOrPayload, true);
@@ -42,18 +39,6 @@ public class ReplyMessageHolder {
return this.createAndAddBuilder(messageOrPayload, false);
}
public void setTargetChannel(MessageChannel targetChannel) {
this.targetChannel = targetChannel;
}
public void setTargetChannelName(String targetChannelName) {
this.targetChannel = targetChannelName;
}
protected Object getTargetChannel() {
return this.targetChannel;
}
public boolean isEmpty() {
return this.builders.isEmpty();
}

2
org.springframework.integration/src/main/java/org/springframework/integration/scheduling/CronSequenceGenerator.java
View File

@@ -44,7 +44,7 @@ import org.springframework.util.StringUtils;
*
* @author Dave Syer
*/
public class CronSequenceGenerator {
class CronSequenceGenerator {
private final BitSet seconds = new BitSet(60);