From 4f2b203b7507cbdb91e49178b9541825a8e26ffa Mon Sep 17 00:00:00 2001 From: franz1981 Date: Tue, 2 Nov 2021 12:40:46 +0100 Subject: [PATCH] QPIDJMS-552 fix testRemotelyEndSessionWithProducerCompletesAsyncSends --- .../main/java/org/apache/qpid/jms/JmsSession.java | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsSession.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsSession.java index 8eb1069d7..1ff357b6b 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsSession.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsSession.java @@ -419,11 +419,6 @@ protected boolean shutdown(Throwable cause) throws JMSException { cause = new JMSException("Session closed remotely before message transfer result was notified"); } asyncProcessCompletion(new FailOrCompleteAsyncCompletionsTask(JmsExceptionSupport.create(cause)), true); - if (connection.getCompletionExecutorService() == null) { - getCompletionExecutor().shutdown(); - } - } - if (connection.getCompletionExecutorService() != null) { final CountDownLatch completed = new CountDownLatch(1); try { asyncProcessCompletion(completed::countDown, true); @@ -431,11 +426,8 @@ protected boolean shutdown(Throwable cause) throws JMSException { } catch (InterruptedException e) { LOG.trace("Session close awaiting send completions was interrupted"); } - } else { - try { - getCompletionExecutor().awaitTermination(connection.getCloseTimeout(), TimeUnit.MILLISECONDS); - } catch (InterruptedException e) { - LOG.trace("Session close awaiting send completions was interrupted"); + if (connection.getCompletionExecutorService() == null) { + getCompletionExecutor().shutdown(); } }