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

Revert NPE check in the FailoverClientConnFactory

Browse Source 
* Add `synchronized` to `MqttPahoMessageDrivenChannelAdapter` setters to fix sync inconsistency
This commit is contained in:
Artem Bilan
2020-03-03 11:11:19 -05:00
parent fc4907d329
commit a795478263
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/FailoverClientConnectionFactory.java
View File

@@ -171,7 +171,7 @@ public class FailoverClientConnectionFactory extends AbstractClientConnectionFac
return failoverTcpConnection;
}
private void closeRefreshedIfNecessary(@Nullable FailoverTcpConnection sharedConnection, boolean refreshShared,
private void closeRefreshedIfNecessary(FailoverTcpConnection sharedConnection, boolean refreshShared,
FailoverTcpConnection failoverTcpConnection) {
this.creationTime = System.currentTimeMillis();
@@ -179,7 +179,6 @@ public class FailoverClientConnectionFactory extends AbstractClientConnectionFac
* We may have simply wrapped the same connection in a new wrapper; don't close.
*/
if (refreshShared && this.closeOnRefresh
&& sharedConnection != null
&& !sharedConnection.delegate.equals(failoverTcpConnection.delegate)
&& sharedConnection.isOpen()) {

4
spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/inbound/MqttPahoMessageDrivenChannelAdapter.java
View File

@@ -128,7 +128,7 @@ public class MqttPahoMessageDrivenChannelAdapter extends AbstractMqttMessageDriv
* @param completionTimeout The timeout.
* @since 4.1
*/
public void setCompletionTimeout(long completionTimeout) {
public synchronized void setCompletionTimeout(long completionTimeout) {
this.completionTimeout = completionTimeout;
}
@@ -138,7 +138,7 @@ public class MqttPahoMessageDrivenChannelAdapter extends AbstractMqttMessageDriv
* @param completionTimeout The timeout.
* @since 5.1.10
*/
public void setDisconnectCompletionTimeout(long completionTimeout) {
public synchronized void setDisconnectCompletionTimeout(long completionTimeout) {
this.disconnectCompletionTimeout = completionTimeout;
}