From 88845df5e2ed76ead268efd575bab405eb3be935 Mon Sep 17 00:00:00 2001
From: Mark Fisher <markfisher@vmware.com>
Date: Wed, 16 Jun 2010 18:32:33 +0000
Subject: [PATCH] no longer have to check if expectedType is void.class after
 Spring 3.0.3 upgrade

---
 .../integration/handler/AbstractMessageProcessor.java       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractMessageProcessor.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractMessageProcessor.java
index fe75788b4c..954652303d 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractMessageProcessor.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractMessageProcessor.java
@@ -45,9 +45,9 @@ public abstract class AbstractMessageProcessor implements MessageProcessor {
 
 	protected Object evaluateExpression(Expression expression, Message<?> message, Class<?> expectedType) {
 		try {
-			return (expectedType != null && expectedType != void.class)
-				? expression.getValue(this.evaluationContext, message, expectedType)
-				: expression.getValue(this.evaluationContext, message);
+			return (expectedType != null)
+					? expression.getValue(this.evaluationContext, message, expectedType)
+					: expression.getValue(this.evaluationContext, message);
 		}
 		catch (EvaluationException e) {
 			Throwable cause = e.getCause();