From f7d2e683ca84bec65c1fdc8cb749082a94255407 Mon Sep 17 00:00:00 2001
From: Michael Minella <michael@michaelminella.com>
Date: Tue, 9 Oct 2012 09:09:50 -0500
Subject: [PATCH] BATCH-1684: Updated the conversion of the output stream to
 String

---
 .../batch/core/repository/dao/JdbcExecutionContextDao.java    | 2 +-
 .../dao/DefaultExecutionContextSerializerTests.java           | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcExecutionContextDao.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcExecutionContextDao.java
index 12ee41713..28785bb8e 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcExecutionContextDao.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcExecutionContextDao.java
@@ -231,7 +231,7 @@ public class JdbcExecutionContextDao extends AbstractJdbcBatchMetadataDao implem
 			throw new IllegalArgumentException("Could not serialize the execution context", ioe);
 		}
 
-		return out.toString();
+		return new String(out.toByteArray());
 	}
 
 	@SuppressWarnings("unchecked")
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/DefaultExecutionContextSerializerTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/DefaultExecutionContextSerializerTests.java
index e21599431..404727750 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/DefaultExecutionContextSerializerTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/DefaultExecutionContextSerializerTests.java
@@ -77,7 +77,6 @@ public class DefaultExecutionContextSerializerTests {
 
 	private void compareContexts(Map<String, Object> m1, Map<String, Object> m2) {
 		for (String key : m1.keySet()) {
-			System.out.println("m1 = " + m1 + " m2 = " + m2);
 			assertEquals("Bad key/value for " + key, m1.get(key), m2.get(key));
 		}
 	}
@@ -87,8 +86,7 @@ public class DefaultExecutionContextSerializerTests {
 		ByteArrayOutputStream out = new ByteArrayOutputStream();
 		serializer.serialize(m1, out);
 
-		out.close();
-		String s = out.toString();
+		String s = new String(out.toByteArray());
 
 		InputStream in = new ByteArrayInputStream(s.getBytes());
 		Map<String, Object> m2 = (Map<String, Object>) serializer.deserialize(in);