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

Guard against NPEs on conversion of null values

Browse Source
This commit is contained in:
Jennifer Hickey
2013-07-22 12:32:02 -07:00
parent f41647b3bc
commit 5ab5ee031e
3 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/springframework/data/redis/connection/jedis/JedisConverters.java
View File

@@ -70,7 +70,7 @@ abstract public class JedisConverters extends Converters {
TUPLE_SET_TO_TUPLE_SET = new SetConverter<redis.clients.jedis.Tuple, Tuple>(
new Converter<redis.clients.jedis.Tuple, Tuple>() {
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;
}
});

4
src/main/java/org/springframework/data/redis/connection/lettuce/LettuceConverters.java
View File

@@ -64,7 +64,7 @@ abstract public class LettuceConverters extends Converters {
static {
DATE_TO_LONG = new Converter<Date, Long>() {
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<ScoredValue<byte[]>, Tuple>() {
public Tuple convert(ScoredValue<byte[]> source) {
return new DefaultTuple(source.value, Double.valueOf(source.score));
return source != null ? new DefaultTuple(source.value, Double.valueOf(source.score)) : null;
}
};

18
src/main/java/org/springframework/data/redis/connection/srp/SrpConverters.java
View File

@@ -85,12 +85,12 @@ abstract public class SrpConverters extends Converters {
};
REPLIES_TO_BYTES_SET = new Converter<Reply[], Set<byte[]>>() {
public Set<byte[]> convert(Reply[] source) {
return new LinkedHashSet<byte[]>(SrpConverters.toBytesList(source));
return source != null ? new LinkedHashSet<byte[]>(SrpConverters.toBytesList(source)) : null;
}
};
BYTES_TO_PROPERTIES = new Converter<byte[], Properties>() {
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<byte[], Double>() {
@@ -101,6 +101,9 @@ abstract public class SrpConverters extends Converters {
};
REPLIES_TO_TUPLE_SET = new Converter<Reply[], Set<Tuple>>() {
public Set<Tuple> convert(Reply[] byteArrays) {
if(byteArrays == null) {
return null;
}
Set<Tuple> tuples = new LinkedHashSet<Tuple>(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<Reply[], Map<byte[], byte[]>>() {
public Map<byte[], byte[]> convert(Reply[] byteArrays) {
if(byteArrays == null) {
return null;
}
Map<byte[], byte[]> map = new LinkedHashMap<byte[], byte[]>(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<byte[], String>() {
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<Reply[], List<Boolean>>() {
public List<Boolean> convert(Reply[] source) {
if(source == null) {
return null;
}
List<Boolean> results = new ArrayList<Boolean>();
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<Reply[], List<String>>() {
public List<String> convert(Reply[] source) {
if(source == null) {
return null;
}
List<String> results = new ArrayList<String>();
for (Reply r : source) {
results.add(SrpConverters.toString((byte[]) r.data()));