From f3dfe2e2bbe32cd953ff47c98b3b47fa17ec1696 Mon Sep 17 00:00:00 2001 From: Costin Leau Date: Mon, 14 Mar 2011 18:28:42 +0200 Subject: [PATCH] DATAKV-38 + fix potential NPE on init --- .../data/keyvalue/redis/support/atomic/RedisAtomicInteger.java | 2 +- .../data/keyvalue/redis/support/atomic/RedisAtomicLong.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/support/atomic/RedisAtomicInteger.java b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/support/atomic/RedisAtomicInteger.java index e178935b9..bc69f1505 100644 --- a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/support/atomic/RedisAtomicInteger.java +++ b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/support/atomic/RedisAtomicInteger.java @@ -74,7 +74,7 @@ public class RedisAtomicInteger extends Number implements Serializable, KeyBound this.generalOps = redisTemplate; this.operations = generalOps.opsForValue(); - if (initialValue == null && this.operations.get(redisCounter) == null) { + if (initialValue == null || this.operations.get(redisCounter) == null) { set(0); } else { diff --git a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/support/atomic/RedisAtomicLong.java b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/support/atomic/RedisAtomicLong.java index 6d87a106a..7fc319b57 100644 --- a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/support/atomic/RedisAtomicLong.java +++ b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/support/atomic/RedisAtomicLong.java @@ -74,7 +74,7 @@ public class RedisAtomicLong extends Number implements Serializable, KeyBound