diff options
Diffstat (limited to 'qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java')
| -rw-r--r-- | qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java index 9612417266..4e885258b9 100644 --- a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java +++ b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java @@ -909,8 +909,6 @@ public class AMQConnection extends Closeable implements Connection, QueueConnect // adjust timeout timeout = adjustTimeout(timeout, startCloseTime); - _delegate.closeConnection(timeout); - //If the taskpool hasn't shutdown by now then give it shutdownNow. // This will interupt any running tasks. if (!_taskPool.isTerminated()) @@ -922,7 +920,7 @@ public class AMQConnection extends Closeable implements Connection, QueueConnect } } } - catch (AMQException e) + catch (JMSException e) { _logger.error("error:", e); JMSException jmse = new JMSException("Error closing connection: " + e); @@ -930,6 +928,17 @@ public class AMQConnection extends Closeable implements Connection, QueueConnect jmse.initCause(e); throw jmse; } + finally + { + try + { + _delegate.closeConnection(timeout); + } + catch (Exception e) + { + _logger.warn("Error closing underlying protocol connection", e); + } + } } } } |