From 4641a23d1448ad7536af03accc5e2de3773abbff Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 4 Mar 2014 10:32:40 +0100
Subject: [PATCH] [FIX] server.stop: avoid traceback during shutdown if HTTP
 service never started (e.g. because address was already in use)

bzr revid: odo@openerp.com-20140304093240-0yfoe3s0xz0u0xv9
---
 openerp/service/server.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/openerp/service/server.py b/openerp/service/server.py
index b3d16bc8ab2..3d02215bbe6 100644
--- a/openerp/service/server.py
+++ b/openerp/service/server.py
@@ -285,8 +285,9 @@ class ThreadedServer(CommonServer):
         _logger.info("Initiating shutdown")
         _logger.info("Hit CTRL-C again or send a second signal to force the shutdown.")
 
-        self.httpd.shutdown()
-        self.close_socket(self.httpd.socket)
+        if self.httpd:
+            self.httpd.shutdown()
+            self.close_socket(self.httpd.socket)
 
         # Manually join() all threads before calling sys.exit() to allow a second signal
         # to trigger _force_quit() in case some non-daemon threads won't exit cleanly.