From 81b125d7e2472539fdef6e569e9ef418afed4078 Mon Sep 17 00:00:00 2001
From: Oleg Zhurakousky <ozhurakousky@vmware.com>
Date: Tue, 3 May 2011 18:46:26 -0400
Subject: [PATCH] INT-1866 polishing

---
 .../integration/http/support/DefaultHttpHeaderMapper.java     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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 cf05e8c49c..021033b7aa 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
@@ -344,7 +344,9 @@ public class DefaultHttpHeaderMapper implements HeaderMapper<HttpHeaders>, BeanF
 	}
 	
 	public void afterPropertiesSet() throws Exception {
-		this.conversionService = IntegrationContextUtils.getConversionService(this.beanFactory);
+		if (this.beanFactory != null){
+			this.conversionService = IntegrationContextUtils.getConversionService(this.beanFactory);
+		}
 	}
 
 	private boolean containsElementIgnoreCase(String[] headerNames, String name){