From 4505629ad88d34bb104e2bdde45d026aa1acecb8 Mon Sep 17 00:00:00 2001 From: Jennifer Hickey Date: Mon, 29 Jul 2013 17:39:20 -0700 Subject: [PATCH] Fix NPE on SRP sort with alpha not set DATAREDIS-230 --- .../data/redis/connection/srp/SrpConnection.java | 3 ++- .../springframework/data/redis/connection/srp/SrpUtils.java | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/springframework/data/redis/connection/srp/SrpConnection.java b/src/main/java/org/springframework/data/redis/connection/srp/SrpConnection.java index 30a2a8e21..158f0cb06 100644 --- a/src/main/java/org/springframework/data/redis/connection/srp/SrpConnection.java +++ b/src/main/java/org/springframework/data/redis/connection/srp/SrpConnection.java @@ -2314,7 +2314,8 @@ public class SrpConnection implements RedisConnection { if (params.getOrder() != null) { arrays.add(params.getOrder().name().getBytes(Charsets.UTF_8)); } - if (params.isAlphabetic()) { + Boolean isAlpha = params.isAlphabetic(); + if (isAlpha != null && isAlpha) { arrays.add(ALPHA); } } diff --git a/src/main/java/org/springframework/data/redis/connection/srp/SrpUtils.java b/src/main/java/org/springframework/data/redis/connection/srp/SrpUtils.java index 137ef53fa..450eaa9ea 100644 --- a/src/main/java/org/springframework/data/redis/connection/srp/SrpUtils.java +++ b/src/main/java/org/springframework/data/redis/connection/srp/SrpUtils.java @@ -272,10 +272,10 @@ abstract class SrpUtils { arrays.add(params.getOrder().name().getBytes(Charsets.UTF_8)); } - if (params.isAlphabetic()) { + Boolean isAlpha = params.isAlphabetic(); + if (isAlpha != null && isAlpha) { arrays.add(ALPHA); } - } if (sortKey != null) {