From 7ba407defe6bbe798d68c67910925a1368e17b7c Mon Sep 17 00:00:00 2001 From: Mark Fisher Date: Wed, 16 Jun 2010 15:58:42 +0000 Subject: [PATCH] INT-1124 relying on $ with MapAccessor after upgrade to Spring 3.0.3 --- .../handler/MethodInvokingMessageProcessor.java | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/MethodInvokingMessageProcessor.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/MethodInvokingMessageProcessor.java index 00f8365a06..a202327e7e 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/handler/MethodInvokingMessageProcessor.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/MethodInvokingMessageProcessor.java @@ -434,15 +434,9 @@ public class MethodInvokingMessageProcessor extends AbstractMessageProcessor { } Assert.notNull(headerName, "Cannot determine header name. Possible reasons: -debug is " + "disabled or header name is not explicitly provided via @Header annotation."); - if (headerName.startsWith("$")) { - // rely on access to getSomeValue for $someValue - headerName = headerName.substring(1); - } String headerExpression = "headers." + headerName + relativeExpression; - if (headerAnnotation.required()) { - return headerExpression; - } - return "headers['" + headerName + "'] != null ? " + headerExpression + " : null"; + return (headerAnnotation.required()) ? headerExpression + : "headers['" + headerName + "'] != null ? " + headerExpression + " : null"; } private synchronized void setExclusiveTargetParameterType(Class targetParameterType) {