From a8fb06ee0786552f09873c857c671edcba1c3445 Mon Sep 17 00:00:00 2001
From: Mark Fisher <markfisher@vmware.com>
Date: Tue, 17 Aug 2010 19:22:18 +0000
Subject: [PATCH] INT-1270 no need for a null check

---
 .../integration/config/xml/ScheduledProducerParser.java     | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/ScheduledProducerParser.java b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/ScheduledProducerParser.java
index 09e22d0f18..77b095a3a1 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/ScheduledProducerParser.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/ScheduledProducerParser.java
@@ -107,13 +107,11 @@ public class ScheduledProducerParser extends AbstractSingleBeanDefinitionParser
 					expressionDef = new RootBeanDefinition("org.springframework.expression.common.LiteralExpression");
 					expressionDef.getConstructorArgumentValues().addGenericArgumentValue(headerValue);
 				}
-				else if (hasExpression) {
+				else {
 					expressionDef = new RootBeanDefinition("org.springframework.integration.config.ExpressionFactoryBean");
 					expressionDef.getConstructorArgumentValues().addGenericArgumentValue(headerExpression);
 				}
-				if (expressionDef != null) {
-					headerExpressions.put(headerName, expressionDef);
-				}
+				headerExpressions.put(headerName, expressionDef);
 			}
 			builder.addPropertyValue("headerExpressions", headerExpressions);
 		}