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

INT-4075: Fix NPE in AbstractStompSessionManager

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

Fixes GH-1854 (https://github.com/spring-projects/spring-integration/issues/1854)

The `catch` block just swallows an Exception with the logger and leaves `stompSessionListenableFuture` as `null`.
The next `stompSessionListenableFuture` usage over two code lines bellow ends up with `NPE`.

* Add reconnect logic into that `catch` block and just return from there, since we don't have anything to go ahead.
* Add `if (e != null) {` around `log.error` in the `scheduleReconnect`
* Add `if...else` around `this.stompClient.getTaskScheduler()` and `log.info()` to notify end-user that there won't be reconnection if there is no `taskScheduler`
* Add `StompSessionManagerTests` mock tests to verify solution

**Cherry-pick to 4.2.x**
This commit is contained in:
Artem Bilan
2016-07-19 17:39:29 -04:00
committed by Gary Russell
parent ecf9554fd0
commit bce851576e
2 changed files with 108 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
spring-integration-stomp/src/main/java/org/springframework/integration/stomp/AbstractStompSessionManager.java
View File

@@ -139,6 +139,7 @@ public abstract class AbstractStompSessionManager implements StompSessionManager
}
/**
* Specify a reconnect interval in milliseconds in case of lost connection.
* @param recoveryInterval the reconnect interval in milliseconds in case of lost connection.
* @since 4.2.2
*/
@@ -189,7 +190,13 @@ public abstract class AbstractStompSessionManager implements StompSessionManager
this.stompSessionListenableFuture = doConnect(this.compositeStompSessionHandler);
}
catch (Exception e) {
this.logger.error("doConnect() error for " + this, e);
if (epoch == this.epoch.get()) {
scheduleReconnect(e);
}
else {
this.logger.error("STOMP doConnect() error for " + this, e);
}
return;
}
final CountDownLatch latch = new CountDownLatch(1);
this.stompSessionListenableFuture.addCallback(new ListenableFutureCallback<StompSession>() {
@@ -239,7 +246,9 @@ public abstract class AbstractStompSessionManager implements StompSessionManager
private void scheduleReconnect(Throwable e) {
this.epoch.incrementAndGet();
this.connecting = this.connected = false;
this.logger.error("STOMP connect error for " + this, e);
if (e != null) {
this.logger.error("STOMP connect error for " + this, e);
}
if (this.applicationEventPublisher != null) {
this.applicationEventPublisher.publishEvent(
new StompConnectionFailedEvent(this, e));
@@ -250,15 +259,20 @@ public abstract class AbstractStompSessionManager implements StompSessionManager
this.reconnectFuture = null;
}
this.reconnectFuture = this.stompClient.getTaskScheduler()
.schedule(new Runnable() {
if (this.stompClient.getTaskScheduler() != null) {
this.reconnectFuture = this.stompClient.getTaskScheduler()
.schedule(new Runnable() {
@Override
public void run() {
connect();
}
@Override
public void run() {
connect();
}
}, new Date(System.currentTimeMillis() + this.recoveryInterval));
}, new Date(System.currentTimeMillis() + this.recoveryInterval));
}
else {
this.logger.info("For automatic reconnection the 'stompClient' should be configured with a TaskScheduler.");
}
}
@Override
@@ -395,7 +409,8 @@ public abstract class AbstractStompSessionManager implements StompSessionManager
@Override
public void handleTransportError(StompSession session, Throwable exception) {
AbstractStompSessionManager.this.logger.error("STOMP transport error for session: [" + session + "]", exception);
AbstractStompSessionManager.this.logger.error("STOMP transport error for session: [" + session + "]",
exception);
this.session = null;
scheduleReconnect(exception);
synchronized (this.delegates) {