diff --git a/src/main/java/org/springframework/data/redis/connection/jedis/JedisConverters.java b/src/main/java/org/springframework/data/redis/connection/jedis/JedisConverters.java index 2cf2b0b36..92a82e4f7 100644 --- a/src/main/java/org/springframework/data/redis/connection/jedis/JedisConverters.java +++ b/src/main/java/org/springframework/data/redis/connection/jedis/JedisConverters.java @@ -70,7 +70,7 @@ abstract public class JedisConverters extends Converters { TUPLE_SET_TO_TUPLE_SET = new SetConverter( new Converter() { public Tuple convert(redis.clients.jedis.Tuple source) { - return new DefaultTuple(source.getBinaryElement(), source.getScore()); + return source != null ? new DefaultTuple(source.getBinaryElement(), source.getScore()) : null; } }); diff --git a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceConverters.java b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceConverters.java index 1a9010da0..a854e8f5f 100644 --- a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceConverters.java +++ b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceConverters.java @@ -64,7 +64,7 @@ abstract public class LettuceConverters extends Converters { static { DATE_TO_LONG = new Converter() { public Long convert(Date source) { - return source.getTime(); + return source != null ? source.getTime() : null; } }; @@ -104,7 +104,7 @@ abstract public class LettuceConverters extends Converters { }; SCORED_VALUE_TO_TUPLE = new Converter, Tuple>() { public Tuple convert(ScoredValue source) { - return new DefaultTuple(source.value, Double.valueOf(source.score)); + return source != null ? new DefaultTuple(source.value, Double.valueOf(source.score)) : null; } }; diff --git a/src/main/java/org/springframework/data/redis/connection/srp/SrpConverters.java b/src/main/java/org/springframework/data/redis/connection/srp/SrpConverters.java index eca3c3f13..fac18b05a 100644 --- a/src/main/java/org/springframework/data/redis/connection/srp/SrpConverters.java +++ b/src/main/java/org/springframework/data/redis/connection/srp/SrpConverters.java @@ -85,12 +85,12 @@ abstract public class SrpConverters extends Converters { }; REPLIES_TO_BYTES_SET = new Converter>() { public Set convert(Reply[] source) { - return new LinkedHashSet(SrpConverters.toBytesList(source)); + return source != null ? new LinkedHashSet(SrpConverters.toBytesList(source)) : null; } }; BYTES_TO_PROPERTIES = new Converter() { public Properties convert(byte[] source) { - return SrpConverters.toProperties(new String(source, Charsets.UTF_8)); + return source != null ? SrpConverters.toProperties(new String(source, Charsets.UTF_8)) : null; } }; BYTES_TO_DOUBLE = new Converter() { @@ -101,6 +101,9 @@ abstract public class SrpConverters extends Converters { }; REPLIES_TO_TUPLE_SET = new Converter>() { public Set convert(Reply[] byteArrays) { + if(byteArrays == null) { + return null; + } Set tuples = new LinkedHashSet(byteArrays.length / 2 + 1); for (int i = 0; i < byteArrays.length; i++) { byte[] value = (byte[]) byteArrays[i].data(); @@ -113,6 +116,9 @@ abstract public class SrpConverters extends Converters { }; REPLIES_TO_BYTES_MAP = new Converter>() { public Map convert(Reply[] byteArrays) { + if(byteArrays == null) { + return null; + } Map map = new LinkedHashMap(byteArrays.length / 2); for (int i = 0; i < byteArrays.length; i++) { map.put((byte[]) byteArrays[i++].data(), (byte[]) byteArrays[i].data()); @@ -122,11 +128,14 @@ abstract public class SrpConverters extends Converters { }; BYTES_TO_STRING = new Converter() { public String convert(byte[] data) { - return new String((byte[]) data, Charsets.UTF_8); + return data != null ? new String((byte[]) data, Charsets.UTF_8) : null; } }; REPLIES_TO_BOOLEAN_LIST = new Converter>() { public List convert(Reply[] source) { + if(source == null) { + return null; + } List results = new ArrayList(); for (Reply r : source) { results.add(SrpConverters.toBoolean(((IntegerReply) r).data())); @@ -136,6 +145,9 @@ abstract public class SrpConverters extends Converters { }; REPLIES_TO_STRING_LIST = new Converter>() { public List convert(Reply[] source) { + if(source == null) { + return null; + } List results = new ArrayList(); for (Reply r : source) { results.add(SrpConverters.toString((byte[]) r.data()));