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

properly cleanup listeners in Message Container

Browse Source
This commit is contained in:
Costin Leau
2013-02-07 21:17:26 +02:00
parent dbf5c7c64c
commit 272c3f96c7
1 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -599,23 +599,31 @@ public class RedisMessageListenerContainer implements InitializingBean, Disposab
private void remove(MessageListener listener, Topic topic, ByteArrayWrapper holder, Map<ByteArrayWrapper, Collection<MessageListener>> mapping, List<byte[]> topicToRemove) {
Collection<MessageListener> listeners = mapping.get(holder);
Collection<MessageListener> listenersToRemove = null;
if (listeners != null) {
// remove only one listener
if (listener != null) {
listeners.remove(listener);
}
// remove all listeners for the given topic
else {
for (MessageListener messageListener : listeners) {
Set<Topic> topics = listenerTopics.get(messageListener);
if (topics != null) {
topics.remove(topic);
}
if (topics.isEmpty()) {
listenerTopics.remove(messageListener);
}
}
listenersToRemove = Collections.singletonList(listener);
}
// no listener given - remove all of them
else {
listenersToRemove = listeners;
}
// start removing listeners
for (MessageListener messageListener : listenersToRemove) {
Set<Topic> topics = listenerTopics.get(messageListener);
if (topics != null) {
topics.remove(topic);
}
if (topics.isEmpty()) {
listenerTopics.remove(messageListener);
}
}
// if we removed everything, remove the empty holder collection
if (listener == null || listeners.isEmpty()) {
mapping.remove(holder);
topicToRemove.add(holder.getArray());