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

DATAREDIS-564 - Delegate expire(…) to pExpire if timeout exceeds Integer.MAX_VALUE.

Browse Source 
Remove pExpireAt workaround that can lead to NullPointerException if called within a transaction/pipeline. Calls to expire(…) with a timeout greater Integer.MAX_VALUE are delegated to pExpire converting seconds to milliseconds.

Related ticket: DATAREDIS-286.
Original Pull Request: #228
This commit is contained in:
Mark Paluch
2016-10-24 14:43:57 +02:00
committed by Christoph Strobl
parent 05809febb9
commit 1fd9aadd70
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/org/springframework/data/redis/connection/jedis/JedisConnection.java
View File

@@ -818,15 +818,10 @@ public class JedisConnection extends AbstractRedisConnection {
public Boolean expire(byte[] key, long seconds) {
/*
* @see DATAREDIS-286 to avoid overflow in Jedis
*
* TODO Remove this workaround when we upgrade to a Jedis version that contains a
* fix for: https://github.com/xetorthio/jedis/pull/575
*/
if (seconds > Integer.MAX_VALUE) {
Assert.notNull(key, "Key must not be null!");
return pExpireAt(key, time() + TimeUnit.SECONDS.toMillis(seconds));
if (seconds > Integer.MAX_VALUE) {
return pExpire(key, TimeUnit.SECONDS.toMillis(seconds));
}
try {
@@ -845,6 +840,9 @@ public class JedisConnection extends AbstractRedisConnection {
}
public Boolean expireAt(byte[] key, long unixTime) {
Assert.notNull(key, "Key must not be null!");
try {
if (isPipelined()) {
pipeline(new JedisResult(pipeline.expireAt(key, unixTime), JedisConverters.longToBoolean()));
@@ -1038,6 +1036,8 @@ public class JedisConnection extends AbstractRedisConnection {
}
public Boolean pExpire(byte[] key, long millis) {
Assert.notNull(key, "Key must not be null!");
try {
if (isPipelined()) {
@@ -1055,6 +1055,9 @@ public class JedisConnection extends AbstractRedisConnection {
}
public Boolean pExpireAt(byte[] key, long unixTimeInMillis) {
Assert.notNull(key, "Key must not be null!");
try {
if (isPipelined()) {
pipeline(new JedisResult(pipeline.pexpireAt(key, unixTimeInMillis), JedisConverters.longToBoolean()));