Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

This closes #2721

This commit is contained in:
Francesco Nigro 2019-06-20 16:28:46 +02:00
parent f6e72504ad d14c0de335
commit 7e6efb26e2
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/AMQPConnectionContext.java
View File

@ -196,8 +196,11 @@ public class AMQPConnectionContext extends ProtonInitializable implements EventH
if (scheduledPool != null && scheduledPool instanceof ThreadPoolExecutor &&
scheduledFuture != null && scheduledFuture instanceof Runnable) {
if (!((ThreadPoolExecutor) scheduledPool).remove((Runnable) scheduledFuture)) {
if (!((ThreadPoolExecutor) scheduledPool).remove((Runnable) scheduledFuture) &&
!scheduledFuture.isCancelled() && !scheduledFuture.isDone()) {
log.warn("Scheduled task can't be removed from scheduledPool.");
} else {
scheduledFuture = null;
}
}
}

2
artemis-protocols/artemis-amqp-protocol/src/test/java/org/apache/activemq/artemis/protocol/amqp/proton/AMQPConnectionContextTest.java
View File

@ -81,6 +81,6 @@ public class AMQPConnectionContextTest {
connectionContext.close(null);
Assert.assertEquals(0, scheduledPool.getTaskCount());
Assert.assertEquals(0, scheduledPool.getQueue().size());
}
}