From ac0c848aebb04261e75e61d559f7b6d82dd5565e Mon Sep 17 00:00:00 2001
From: Mark Fisher <markfisher@vmware.com>
Date: Thu, 10 Dec 2009 00:37:27 +0000
Subject: [PATCH] formatting (same as the 1.0.x change)

---
 .../integration/http/DefaultInboundRequestMapper.java        | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/org.springframework.integration.http/src/main/java/org/springframework/integration/http/DefaultInboundRequestMapper.java b/org.springframework.integration.http/src/main/java/org/springframework/integration/http/DefaultInboundRequestMapper.java
index b6fc6ac002..ca4f6091c6 100644
--- a/org.springframework.integration.http/src/main/java/org/springframework/integration/http/DefaultInboundRequestMapper.java
+++ b/org.springframework.integration.http/src/main/java/org/springframework/integration/http/DefaultInboundRequestMapper.java
@@ -236,9 +236,8 @@ public class DefaultInboundRequestMapper implements InboundRequestMapper {
 	}
 
 	private Object createPayloadFromTextContent(HttpServletRequest request) throws IOException {
- 		String charSet = request.getCharacterEncoding() == null ? "utf-8" : request.getCharacterEncoding();
-		String str = new String(FileCopyUtils.copyToByteArray(request.getInputStream()), charSet);
-		return str;
+ 		String charset = request.getCharacterEncoding() != null ? request.getCharacterEncoding() : "utf-8";
+		return new String(FileCopyUtils.copyToByteArray(request.getInputStream()), charset);
 	}
 
 	private Object createPayloadFromSerializedObject(HttpServletRequest request) {