From 9ffc1a08c3690bbcffb1bf0fce307d331119a8cc Mon Sep 17 00:00:00 2001
From: Mark Fisher <markfisher@vmware.com>
Date: Wed, 26 Nov 2008 15:56:15 +0000
Subject: [PATCH] Removed the 'targetChannel' from ReplyMessageHolder for now
 (not being used yet) and made CronSequenceGenerator package protected for
 now.

---
 .../AbstractReplyProducingMessageHandler.java     |  9 +--------
 .../integration/handler/ReplyMessageHolder.java   | 15 ---------------
 .../scheduling/CronSequenceGenerator.java         |  2 +-
 3 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/handler/AbstractReplyProducingMessageHandler.java b/org.springframework.integration/src/main/java/org/springframework/integration/handler/AbstractReplyProducingMessageHandler.java
index c8506095c5..a281e08a3c 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/handler/AbstractReplyProducingMessageHandler.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/handler/AbstractReplyProducingMessageHandler.java
@@ -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);
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/handler/ReplyMessageHolder.java b/org.springframework.integration/src/main/java/org/springframework/integration/handler/ReplyMessageHolder.java
index 4534fd0c70..db86c998de 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/handler/ReplyMessageHolder.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/handler/ReplyMessageHolder.java
@@ -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();
 	}
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/scheduling/CronSequenceGenerator.java b/org.springframework.integration/src/main/java/org/springframework/integration/scheduling/CronSequenceGenerator.java
index d6b8c30ead..fa0c4b1509 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/scheduling/CronSequenceGenerator.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/scheduling/CronSequenceGenerator.java
@@ -44,7 +44,7 @@ import org.springframework.util.StringUtils;
  * 
  * @author Dave Syer
  */
-public class CronSequenceGenerator {
+class CronSequenceGenerator {
 
 	private final BitSet seconds = new BitSet(60);