diff options
Diffstat (limited to 'java/client/src')
| -rw-r--r-- | java/client/src/main/java/org/apache/qpid/client/AMQConnection.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java b/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java index 85542830bf..6adb7f345c 100644 --- a/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java +++ b/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java @@ -927,9 +927,11 @@ public class AMQConnection extends Closeable implements Connection, QueueConnect { long startCloseTime = System.currentTimeMillis(); - _taskPool.shutdown(); closeAllSessions(null, timeout, startCloseTime); + //This MUST occur after we have successfully closed all Channels/Sessions + _taskPool.shutdown(); + if (!_taskPool.isTerminated()) { try |