diff --git a/src/main/java/org/springframework/data/redis/core/RedisOperations.java b/src/main/java/org/springframework/data/redis/core/RedisOperations.java index 4ee6f3a18..a58a96b42 100644 --- a/src/main/java/org/springframework/data/redis/core/RedisOperations.java +++ b/src/main/java/org/springframework/data/redis/core/RedisOperations.java @@ -117,7 +117,7 @@ public interface RedisOperations { List exec(); // pubsub functionality on the template - void convertAndSend(String destination, Object message); + Long convertAndSend(String destination, Object message); // operation types diff --git a/src/main/java/org/springframework/data/redis/core/RedisTemplate.java b/src/main/java/org/springframework/data/redis/core/RedisTemplate.java index 2cc5b1a14..080b69f45 100644 --- a/src/main/java/org/springframework/data/redis/core/RedisTemplate.java +++ b/src/main/java/org/springframework/data/redis/core/RedisTemplate.java @@ -484,17 +484,16 @@ public class RedisTemplate extends RedisAccessor implements RedisOperation } - public void convertAndSend(String channel, Object message) { + public Long convertAndSend(String channel, Object message) { Assert.hasText(channel, "a non-empty channel is required"); final byte[] rawChannel = rawString(channel); final byte[] rawMessage = rawValue(message); - execute(new RedisCallback() { + return execute(new RedisCallback() { - public Object doInRedis(RedisConnection connection) { - connection.publish(rawChannel, rawMessage); - return null; + public Long doInRedis(RedisConnection connection) { + return connection.publish(rawChannel, rawMessage); } }, true); } @@ -511,7 +510,7 @@ public class RedisTemplate extends RedisAccessor implements RedisOperation return execute(new RedisCallback() { public Long doInRedis(RedisConnection connection) { - return Long.valueOf(connection.ttl(rawKey)); + return connection.ttl(rawKey); } }, true); }