From c979dd63e7c672146be843dc5fddb8e405ad7f31 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Wed, 5 Jan 2011 16:18:09 -0500 Subject: [PATCH] INT-1734 polishing DefaultHttpHeaderMapper --- .../http/support/DefaultHttpHeaderMapper.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/spring-integration-http/src/main/java/org/springframework/integration/http/support/DefaultHttpHeaderMapper.java b/spring-integration-http/src/main/java/org/springframework/integration/http/support/DefaultHttpHeaderMapper.java index f04fbcb10f..b8ec4f24bf 100644 --- a/spring-integration-http/src/main/java/org/springframework/integration/http/support/DefaultHttpHeaderMapper.java +++ b/spring-integration-http/src/main/java/org/springframework/integration/http/support/DefaultHttpHeaderMapper.java @@ -318,17 +318,16 @@ public class DefaultHttpHeaderMapper implements HeaderMapper { private boolean shouldMapHeader(String headerName, String[] patterns) { if (patterns != null && patterns.length > 0) { - headerName = headerName.toLowerCase(); for (String pattern : patterns) { - pattern = pattern.toLowerCase(); - if (PatternMatchUtils.simpleMatch(pattern, headerName)) { + + if (PatternMatchUtils.simpleMatch(pattern.toLowerCase(), headerName.toLowerCase())) { return true; } - else if (HTTP_REQUEST_HEADER_NAME_PATTERN.equalsIgnoreCase(pattern) + else if (HTTP_REQUEST_HEADER_NAME_PATTERN.equals(pattern) && this.containsElementIgnoreCase(HTTP_REQUEST_HEADER_NAMES, headerName)) { return true; } - else if (HTTP_RESPONSE_HEADER_NAME_PATTERN.equalsIgnoreCase(pattern) + else if (HTTP_RESPONSE_HEADER_NAME_PATTERN.equals(pattern) && this.containsElementIgnoreCase(HTTP_RESPONSE_HEADER_NAMES, headerName)) { return true; }