From 71f6a7278bcac2c2678786a0f85f4e4896613c15 Mon Sep 17 00:00:00 2001
From: Mark Fisher <markfisher@vmware.com>
Date: Fri, 5 Aug 2011 14:41:46 -0400
Subject: [PATCH] updated MessageBuilder.copyHeadersIfAbsent with a wildcard
 for the Map value to be more flexible and consistent with copyHeaders

---
 .../integration/amqp/outbound/AmqpOutboundEndpoint.java        | 3 +--
 .../springframework/integration/support/MessageBuilder.java    | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/outbound/AmqpOutboundEndpoint.java b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/outbound/AmqpOutboundEndpoint.java
index 5539b9d832..5a2ad4771e 100644
--- a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/outbound/AmqpOutboundEndpoint.java
+++ b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/outbound/AmqpOutboundEndpoint.java
@@ -132,8 +132,7 @@ public class AmqpOutboundEndpoint extends AbstractReplyProducingMessageHandler {
 				? MessageBuilder.fromMessage((Message<?>) replyObject)
 				: MessageBuilder.withPayload(replyObject);
 		Map<String, ?> headers = this.headerMapper.toHeaders(amqpReplyMessage.getMessageProperties());
-		// TODO: copyHeadersIfAbsent has <String, Object> instead of <String, ?>
-		builder.copyHeaders(headers);
+		builder.copyHeadersIfAbsent(headers);
 		return builder.build();
 	}
 
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/support/MessageBuilder.java b/spring-integration-core/src/main/java/org/springframework/integration/support/MessageBuilder.java
index f029d3b5dc..b50b4bc42f 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/support/MessageBuilder.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/support/MessageBuilder.java
@@ -183,7 +183,7 @@ public final class MessageBuilder<T> {
 	/**
 	 * Copy the name-value pairs from the provided Map. This operation will <em>not</em> overwrite any existing values.
 	 */
-	public MessageBuilder<T> copyHeadersIfAbsent(Map<String, Object> headersToCopy) {
+	public MessageBuilder<T> copyHeadersIfAbsent(Map<String, ?> headersToCopy) {
 		Set<String> keys = headersToCopy.keySet();
 		for (String key : keys) {
 			if (!this.isReadOnly(key)) {