From d8e4b05346b5f4f9dd9eed3b7f6832c9796ca9de Mon Sep 17 00:00:00 2001
From: Keith Wall <kwall@apache.org>
Date: Sat, 4 Apr 2015 12:19:29 +0000
Subject: 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
---
 .../java/org/apache/qpid/server/transport/TCPandSSLTransport.java    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'qpid/java')

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
-- 
cgit v1.2.1