Fix NPE when deserializing a null Map

DATAREDIS-138
This commit is contained in:
Jennifer Hickey
2013-04-01 09:53:08 -07:00
parent 323f8097a7
commit fb25e79380
6 changed files with 55 additions and 77 deletions

View File

@@ -613,13 +613,7 @@ public class DefaultStringRedisConnection implements StringRedisConnection {
}
private Map<String, String> deserialize(Map<byte[], byte[]> hashes) {
Map<String, String> ret = new LinkedHashMap<String, String>(hashes.size());
for (Map.Entry<byte[], byte[]> entry : hashes.entrySet()) {
ret.put(serializer.deserialize(entry.getKey()), serializer.deserialize(entry.getValue()));
}
return ret;
return SerializationUtils.deserialize(hashes, serializer);
}
private List<String> deserialize(List<byte[]> data) {