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

DATAREDIS-289 - Avoid NPE in DefaultValueOperations#append() in case of pipelining or/and multi/exec calls.

Browse Source 
We now return null if DefaultValueOperations#append() was applied to a non-existing list and thus returned null. Previously a NPE was thrown in case of pipelining or/and multi/exec calls.

Original pull request: #48.
This commit is contained in:
reta
2014-03-26 13:46:17 +01:00
committed by Thomas Darimont
parent 2806567acc
commit ceb7c8a077
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/org/springframework/data/redis/core/DefaultValueOperations.java
View File

@@ -83,7 +83,8 @@ class DefaultValueOperations<K, V> extends AbstractOperations<K, V> implements V
return execute(new RedisCallback<Integer>() {
public Integer doInRedis(RedisConnection connection) {
return connection.append(rawKey, rawString).intValue();
final Long result = connection.append(rawKey, rawString);
return ( result != null ) ? result.intValue() : null;
}
}, true);
}

3
src/test/java/org/springframework/data/redis/core/RedisTemplateTests.java
View File

@@ -221,6 +221,7 @@ public class RedisTemplateTests<K, V> {
operations.multi();
operations.opsForValue().set("foo", "5");
operations.opsForValue().get("foo");
operations.opsForValue().append("foo1", "5");
operations.opsForList().leftPush("foolist", "6");
operations.opsForList().range("foolist", 0l, 1l);
operations.opsForSet().add("fooset", "7");
@@ -242,7 +243,7 @@ public class RedisTemplateTests<K, V> {
Map<Long, Long> map = new LinkedHashMap<Long, Long>();
map.put(10l, 11l);
assertThat(results,
isEqual(Arrays.asList(new Object[] { 5l, 1l, list, 1l, longSet, true, tupleSet, zSet, true, map })));
isEqual(Arrays.asList(new Object[] { 5l, 1L, 1l, list, 1l, longSet, true, tupleSet, zSet, true, map })));
}
@Test