From 71ba875cdcc6450a132af93f5d61299337eb1772 Mon Sep 17 00:00:00 2001
From: Mark Fisher <markfisher@vmware.com>
Date: Tue, 16 Dec 2008 20:39:18 +0000
Subject: [PATCH] Added a check to ensure that an Object-typed parameter
 receives the Message payload instance instead of the Message itself. The
 parameter type must be assignable to Message for the Message instance to be
 passed.

---
 .../integration/message/MethodParameterMessageMapper.java      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/message/MethodParameterMessageMapper.java b/org.springframework.integration/src/main/java/org/springframework/integration/message/MethodParameterMessageMapper.java
index 529d00141a..1662797414 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/message/MethodParameterMessageMapper.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/message/MethodParameterMessageMapper.java
@@ -138,7 +138,8 @@ public class MethodParameterMessageMapper implements InboundMessageMapper<Object
 					args[i] = message.getHeaders();					
 				}
 			}
-			else if (expectedType.isAssignableFrom(message.getClass())) {
+			else if (expectedType.isAssignableFrom(message.getClass())
+					&& Message.class.isAssignableFrom(expectedType)) {
 				args[i] = message;
 			}
 			else {