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

Use proper subscribe methods and fix nullability assumptions.

Browse Source 
See: #964
Original Pull Request: #2256
This commit is contained in:
Mark Paluch
2022-02-11 08:31:18 +01:00
committed by Christoph Strobl
parent 5959efb3af
commit 5681ddce68
2 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/org/springframework/data/redis/listener/RedisMessageListenerContainer.java
View File

@@ -596,7 +596,7 @@ public class RedisMessageListenerContainer implements InitializingBean, Disposab
* @param listener message listener
* @param topics message listener topics
*/
public void removeMessageListener(MessageListener listener, Collection<? extends Topic> topics) {
public void removeMessageListener(@Nullable MessageListener listener, Collection<? extends Topic> topics) {
removeListener(listener, topics);
}
@@ -610,7 +610,7 @@ public class RedisMessageListenerContainer implements InitializingBean, Disposab
* @param listener message listener
* @param topic message topic
*/
public void removeMessageListener(MessageListener listener, Topic topic) {
public void removeMessageListener(@Nullable MessageListener listener, Topic topic) {
removeMessageListener(listener, Collections.singleton(topic));
}
@@ -621,6 +621,8 @@ public class RedisMessageListenerContainer implements InitializingBean, Disposab
* @param listener message listener
*/
public void removeMessageListener(MessageListener listener) {
Assert.notNull(listener, "MessageListener must not be null");
removeMessageListener(listener, Collections.emptySet());
}
@@ -717,12 +719,11 @@ public class RedisMessageListenerContainer implements InitializingBean, Disposab
}
}
private void removeListener(MessageListener listener, Collection<? extends Topic> topics) {
private void removeListener(@Nullable MessageListener listener, Collection<? extends Topic> topics) {
Assert.notNull(listener, "MessageListener must not be null");
Assert.notNull(topics, "Topics must not be null");
if (listenerTopics.get(listener) == null) {
if (listener != null && listenerTopics.get(listener) == null) {
// Listener not subscribed
return;
}
@@ -1197,7 +1198,11 @@ public class RedisMessageListenerContainer implements InitializingBean, Disposab
}
if (!channels.isEmpty()) {
connection.subscribe(synchronizingMessageListener, channels.toArray(new byte[0][]));
if (patterns.isEmpty()) {
connection.subscribe(synchronizingMessageListener, channels.toArray(new byte[0][]));
} else {
subscribeChannel(channels.toArray(new byte[0][]));
}
}
}