From de82ec9eafaa58a2317154dc5d27d40fc36f73eb Mon Sep 17 00:00:00 2001
From: Mark Fisher <markfisher@vmware.com>
Date: Mon, 2 Aug 2010 03:11:45 +0000
Subject: [PATCH] INT-1307 using charset.name() instead of charset itself in
 String constructor for Java 5 compatibility

---
 .../integration/http/SimpleMultipartFileReader.java             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-integration-http/src/main/java/org/springframework/integration/http/SimpleMultipartFileReader.java b/spring-integration-http/src/main/java/org/springframework/integration/http/SimpleMultipartFileReader.java
index 4f9e7d0330..a8c39dc789 100644
--- a/spring-integration-http/src/main/java/org/springframework/integration/http/SimpleMultipartFileReader.java
+++ b/spring-integration-http/src/main/java/org/springframework/integration/http/SimpleMultipartFileReader.java
@@ -52,7 +52,7 @@ public class SimpleMultipartFileReader implements MultipartFileReader<Object> {
 			if (charset == null) {
 				charset = defaultCharset;
 			}
-			return new String(multipartFile.getBytes(), charset);
+			return new String(multipartFile.getBytes(), charset.name());
 		}
 		else {
 			return multipartFile.getBytes();