From 48e9d34a2f9bc6ef4f69a0138210c455265578cf Mon Sep 17 00:00:00 2001 From: Jennifer Hickey Date: Wed, 24 Jul 2013 15:08:12 -0700 Subject: [PATCH] Fix NPE on deserialize of Tuple values in tx/pipeline DATAREDIS-229 --- .../springframework/data/redis/core/AbstractOperations.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/org/springframework/data/redis/core/AbstractOperations.java b/src/main/java/org/springframework/data/redis/core/AbstractOperations.java index 11a51bda8..faf2637be 100644 --- a/src/main/java/org/springframework/data/redis/core/AbstractOperations.java +++ b/src/main/java/org/springframework/data/redis/core/AbstractOperations.java @@ -150,6 +150,9 @@ abstract class AbstractOperations { @SuppressWarnings("unchecked") Set> deserializeTupleValues(Set rawValues) { + if(rawValues == null) { + return null; + } Set> set = new LinkedHashSet>(rawValues.size()); for (Tuple rawValue : rawValues) { set.add(new DefaultTypedTuple(valueSerializer().deserialize(rawValue.getValue()), rawValue.getScore()));