NO-JIRA: Small test client fix to close threads out faster.
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/92116612 Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/92116612 Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/92116612 Branch: refs/heads/activemq-5.14.x Commit: 92116612446eefee2420c19d761153977dda00fb Parents: 12ee866 Author: Timothy Bish <[email protected]> Authored: Thu Sep 15 16:28:16 2016 -0400 Committer: Timothy Bish <[email protected]> Committed: Tue Sep 27 12:15:30 2016 -0400 ---------------------------------------------------------------------- .../activemq/transport/amqp/client/AmqpConnection.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/92116612/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/AmqpConnection.java ---------------------------------------------------------------------- diff --git a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/AmqpConnection.java b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/AmqpConnection.java index 1c795a8..3328044 100644 --- a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/AmqpConnection.java +++ b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/AmqpConnection.java @@ -226,7 +226,13 @@ public class AmqpConnection extends AmqpAbstractResource<Connection> implements } } - serializer.shutdown(); + serializer.shutdownNow(); + try { + if (!serializer.awaitTermination(10, TimeUnit.SECONDS)) { + LOG.warn("Serializer didn't shutdown cleanly"); + } + } catch (InterruptedException e) { + } } } }
