diff options
| author | Keith Wall <kwall@apache.org> | 2015-04-04 12:19:29 +0000 |
|---|---|---|
| committer | Keith Wall <kwall@apache.org> | 2015-04-04 12:19:29 +0000 |
| commit | d8e4b05346b5f4f9dd9eed3b7f6832c9796ca9de (patch) | |
| tree | daa16457c119ca3aa86eb2ef738b263f7c32dc63 /qpid/java | |
| parent | b897ed2296e1588164132c47c78d8acc6eacc525 (diff) | |
| download | qpid-python-d8e4b05346b5f4f9dd9eed3b7f6832c9796ca9de.tar.gz | |
QPID-6429: [Java Broker] Prevent NPE on shutdown if an AMQP port failed to bind on startup
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1671267 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java')
| -rw-r--r-- | qpid/java/broker-core/src/main/java/org/apache/qpid/server/transport/TCPandSSLTransport.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/transport/TCPandSSLTransport.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/transport/TCPandSSLTransport.java index ad236733d3..480ab14f7f 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/transport/TCPandSSLTransport.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/transport/TCPandSSLTransport.java @@ -111,7 +111,10 @@ class TCPandSSLTransport implements AcceptingTransport @Override public void close() { - _networkTransport.close(); + if (_networkTransport != null) + { + _networkTransport.close(); + } } class ServerNetworkTransportConfiguration implements NetworkTransportConfiguration |