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

properly close the underlying pubsub connection on (p)unsubscribe all

Browse Source 
DATAREDIS-113
This commit is contained in:
Costin Leau
2013-02-07 21:16:50 +02:00
parent 0851fa3c20
commit dbf5c7c64c
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/org/springframework/data/redis/connection/lettuce/LettuceConnection.java
View File

@@ -65,7 +65,6 @@ public class LettuceConnection implements RedisConnection {
private final com.lambdaworks.redis.RedisAsyncConnection<byte[], byte[]> asyncConn;
private final com.lambdaworks.redis.RedisConnection<byte[], byte[]> con;
private RedisPubSubConnection<byte[], byte[]> pubsub;
private final RedisCodec<byte[], byte[]> codec = LettuceUtils.CODEC;
private final long timeout;
@@ -157,7 +156,7 @@ public class LettuceConnection implements RedisConnection {
}
public RedisAsyncConnection<byte[], byte[]> getNativeConnection() {
return (pubsub != null ? pubsub : asyncConn);
return (subscription != null ? subscription.pubsub : asyncConn);
}

3
src/main/java/org/springframework/data/redis/connection/lettuce/LettuceSubscription.java
View File

@@ -28,7 +28,7 @@ import com.lambdaworks.redis.pubsub.RedisPubSubConnection;
*/
class LettuceSubscription extends AbstractSubscription {
private final RedisPubSubConnection<byte[], byte[]> pubsub;
final RedisPubSubConnection<byte[], byte[]> pubsub;
private LettuceMessageListener listener;
LettuceSubscription(MessageListener listener, RedisPubSubConnection<byte[], byte[]> pubsubConnection) {
@@ -43,6 +43,7 @@ class LettuceSubscription extends AbstractSubscription {
pubsub.unsubscribe(new byte[0]);
pubsub.punsubscribe(new byte[0]);
pubsub.removeListener(this.listener);
pubsub.close();
}