Skip to content

Commit dbf5c7c

Browse files
author
Costin Leau
committed
properly close the underlying pubsub connection on (p)unsubscribe all
DATAREDIS-113
1 parent 0851fa3 commit dbf5c7c

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ public class LettuceConnection implements RedisConnection {
6565

6666
private final com.lambdaworks.redis.RedisAsyncConnection<byte[], byte[]> asyncConn;
6767
private final com.lambdaworks.redis.RedisConnection<byte[], byte[]> con;
68-
private RedisPubSubConnection<byte[], byte[]> pubsub;
6968
private final RedisCodec<byte[], byte[]> codec = LettuceUtils.CODEC;
7069
private final long timeout;
7170

@@ -157,7 +156,7 @@ public boolean isClosed() {
157156
}
158157

159158
public RedisAsyncConnection<byte[], byte[]> getNativeConnection() {
160-
return (pubsub != null ? pubsub : asyncConn);
159+
return (subscription != null ? subscription.pubsub : asyncConn);
161160
}
162161

163162

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
*/
2929
class LettuceSubscription extends AbstractSubscription {
3030

31-
private final RedisPubSubConnection<byte[], byte[]> pubsub;
31+
final RedisPubSubConnection<byte[], byte[]> pubsub;
3232
private LettuceMessageListener listener;
3333

3434
LettuceSubscription(MessageListener listener, RedisPubSubConnection<byte[], byte[]> pubsubConnection) {
@@ -43,6 +43,7 @@ protected void doClose() {
4343
pubsub.unsubscribe(new byte[0]);
4444
pubsub.punsubscribe(new byte[0]);
4545
pubsub.removeListener(this.listener);
46+
pubsub.close();
4647
}
4748

4849

0 commit comments

Comments
 (0)