From e9d0f02f5eebb1670678e5b6e9d070193609c944 Mon Sep 17 00:00:00 2001
From: Costin Leau <cleau@vmware.com>
Date: Fri, 3 Dec 2010 16:59:41 +0200
Subject: [PATCH] + add fix between jedis/jredis on zrank

---
 .../data/keyvalue/redis/core/RedisTemplate.java           | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/core/RedisTemplate.java b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/core/RedisTemplate.java
index e1150bcf0..cbe4ed605 100644
--- a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/core/RedisTemplate.java
+++ b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/core/RedisTemplate.java
@@ -434,7 +434,7 @@ public class RedisTemplate<K, V> extends RedisAccessor implements RedisOperation
 				return connection.keys(rawKey);
 			}
 		}, true);
-		
+
 		return (Set<K>) deserializeKeys(rawKeys, Set.class);
 	}
 
@@ -1100,7 +1100,8 @@ public class RedisTemplate<K, V> extends RedisAccessor implements RedisOperation
 			return execute(new RedisCallback<Long>() {
 				@Override
 				public Long doInRedis(RedisConnection connection) {
-					return connection.zRank(rawKey, rawValue);
+					Long zRank = connection.zRank(rawKey, rawValue);
+					return (zRank != null && zRank.longValue() >= 0 ? zRank : null);
 				}
 			}, true);
 		}
@@ -1113,7 +1114,8 @@ public class RedisTemplate<K, V> extends RedisAccessor implements RedisOperation
 			return execute(new RedisCallback<Long>() {
 				@Override
 				public Long doInRedis(RedisConnection connection) {
-					return connection.zRevRank(rawKey, rawValue);
+					Long zRank = connection.zRevRank(rawKey, rawValue);
+					return (zRank != null && zRank.longValue() >= 0 ? zRank : null);
 				}
 			}, true);
 		}