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

remove unused code + add NPE fix

Browse Source
This commit is contained in:
Costin Leau
2013-02-07 21:30:06 +02:00
parent b656c9318d
commit e631af2f2e
1 changed files with 1 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,7 +34,6 @@ import org.springframework.beans.factory.InitializingBean;
import org.springframework.context.SmartLifecycle;
import org.springframework.core.task.SimpleAsyncTaskExecutor;
import org.springframework.core.task.TaskExecutor;
import org.springframework.dao.DataAccessException;
import org.springframework.data.redis.connection.Message;
import org.springframework.data.redis.connection.MessageListener;
import org.springframework.data.redis.connection.RedisConnection;
@@ -619,7 +618,7 @@ public class RedisMessageListenerContainer implements InitializingBean, Disposab
if (topics != null) {
topics.remove(topic);
}
if (topics.isEmpty()) {
if (CollectionUtils.isEmpty(topics)) {
listenerTopics.remove(messageListener);
}
}
@@ -747,7 +746,6 @@ public class RedisMessageListenerContainer implements InitializingBean, Disposab
if (!listening) {
return;
}
boolean shouldWait = listening;
listening = false;
if (logger.isTraceEnabled()) {
@@ -767,23 +765,6 @@ public class RedisMessageListenerContainer implements InitializingBean, Disposab
}
}
private void cleanUpConnection() {
listening = false;
if (connection != null) {
synchronized (localMonitor) {
if (connection != null) {
RedisConnection con = connection;
connection = null;
try {
con.close();
} catch (DataAccessException ex) {
logger.trace("Closing connection threw", ex);
}
}
}
}
}
void subscribeChannel(byte[]... channels) {
if (channels != null && channels.length > 0) {
if (connection != null) {