Spring/spring-batch
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BATCH-1684: Forcing the use of ISO-8859-1 encoding for persistence

Browse Source
This commit is contained in:
Michael Minella
2012-10-09 10:12:27 -05:00
parent bfdce48ac2
commit f00a0076d6
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcExecutionContextDao.java
View File

@@ -224,14 +224,17 @@ public class JdbcExecutionContextDao extends AbstractJdbcBatchMetadataDao implem
}
ByteArrayOutputStream out = new ByteArrayOutputStream();
String results = "";
try {
serializer.serialize(m, out);
results = new String(out.toByteArray(), "ISO-8859-1");
}
catch (IOException ioe) {
throw new IllegalArgumentException("Could not serialize the execution context", ioe);
}
return new String(out.toByteArray());
return results;
}
@SuppressWarnings("unchecked")
@@ -242,10 +245,10 @@ public class JdbcExecutionContextDao extends AbstractJdbcBatchMetadataDao implem
if (serializedContext == null) {
serializedContext = rs.getString("SHORT_CONTEXT");
}
ByteArrayInputStream in = new ByteArrayInputStream(serializedContext.getBytes());
Map<String, Object> map;
try {
ByteArrayInputStream in = new ByteArrayInputStream(serializedContext.getBytes("ISO-8859-1"));
map = (Map<String, Object>) serializer.deserialize(in);
}
catch (IOException ioe) {

4
spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/DefaultExecutionContextSerializerTests.java
View File

@@ -86,9 +86,9 @@ public class DefaultExecutionContextSerializerTests {
ByteArrayOutputStream out = new ByteArrayOutputStream();
serializer.serialize(m1, out);
String s = new String(out.toByteArray());
String s = new String(out.toByteArray(), "ISO-8859-1");
InputStream in = new ByteArrayInputStream(s.getBytes());
InputStream in = new ByteArrayInputStream(s.getBytes("ISO-8859-1"));
Map<String, Object> m2 = (Map<String, Object>) serializer.deserialize(in);
return m2;
}