From 554779bfa816eaaa220c4a3d6754c347689011cb Mon Sep 17 00:00:00 2001
From: Mark Fisher <markfisher@vmware.com>
Date: Wed, 25 Nov 2009 19:37:47 +0000
Subject: [PATCH] INT-878 Added an error if the "type" attribute is specified
 on a header that has a fixed type (e.g. "expiration-date").

---
 .../integration/config/xml/HeaderEnricherParserSupport.java  | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/HeaderEnricherParserSupport.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/HeaderEnricherParserSupport.java
index 5e6205f9e3..683a7ab239 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/HeaderEnricherParserSupport.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/HeaderEnricherParserSupport.java
@@ -89,6 +89,11 @@ public abstract class HeaderEnricherParserSupport extends AbstractTransformerPar
 				else {
 					headerName = elementToNameMap.get(elementName);
 					headerType = elementToTypeMap.get(elementName);
+					if (headerType != null && StringUtils.hasText(headerElement.getAttribute("type"))) {
+						parserContext.getReaderContext().error("The " + elementName 
+								+ " header does not accept a 'type' attribute. The required type is ["
+								+ headerType.getName() + "]", element);
+					}
 				}
 				if (headerType == null) {
 					String headerTypeName = headerElement.getAttribute("type");