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

INT-4486: Properly implement stop(Runnable)

Browse Source 
JIRA: https://jira.spring.io/browse/INT-4486

The `SmartLifecycle.stop(Runnable callback)` must always call the
`callback` in the end independently of the internal state

* Revise all the `SmartLifecycle` implementations for the proper
`callback` handling

**Cherry-pick to 5.0.x and 4.3.x**
This commit is contained in:
Artem Bilan
2018-06-11 14:29:06 -04:00
committed by Gary Russell
parent 125cc861d4
commit 1ce656e4fe
11 changed files with 67 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
spring-integration-redis/src/main/java/org/springframework/integration/redis/channel/SubscribableRedisChannel.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2016 the original author or authors.
* Copyright 2002-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -51,6 +51,7 @@ import org.springframework.util.StringUtils;
* @author Oleg Zhurakousky
* @author Gary Russell
* @author Artem Bilan
*
* @since 2.0
*/
@SuppressWarnings("rawtypes")
@@ -105,7 +106,6 @@ public class SubscribableRedisChannel extends AbstractMessageChannel
/**
* Specify the maximum number of subscribers supported by the
* channel's dispatcher.
*
* @param maxSubscribers The maximum number of subscribers allowed.
*/
public void setMaxSubscribers(int maxSubscribers) {
@@ -168,45 +168,37 @@ public class SubscribableRedisChannel extends AbstractMessageChannel
@Override
public boolean isAutoStartup() {
return (this.container != null) && this.container.isAutoStartup();
return this.container.isAutoStartup();
}
@Override
public int getPhase() {
return (this.container != null) ? this.container.getPhase() : 0;
return this.container.getPhase();
}
@Override
public boolean isRunning() {
return (this.container != null) && this.container.isRunning();
return this.container.isRunning();
}
@Override
public void start() {
if (this.container != null) {
this.container.start();
}
this.container.start();
}
@Override
public void stop() {
if (this.container != null) {
this.container.stop();
}
this.container.stop();
}
@Override
public void stop(Runnable callback) {
if (this.container != null) {
this.container.stop(callback);
}
this.container.stop(callback);
}
@Override
public void destroy() throws Exception {
if (this.container != null) {
this.container.destroy();
}
this.container.destroy();
}
private class MessageListenerDelegate {
@@ -230,6 +222,7 @@ public class SubscribableRedisChannel extends AbstractMessageChannel
+ "' (" + SubscribableRedisChannel.this.getFullChannelName() + ").", e);
}
}
}
}