From 1d7a0334f36a3eb2519e6eea1e5a8e34d22151b1 Mon Sep 17 00:00:00 2001
From: Ann Kamyshnikova <akamyshnikova@mirantis.com>
Date: Mon, 11 Jul 2016 13:02:53 +0300
Subject: [PATCH] Add check that factory started in dispose

Change-Id: I60d31277a698bd65d12f75e633ac4bd5230e6dcd
Partial-bug: #1600530
---
 neutron/db/api.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/neutron/db/api.py b/neutron/db/api.py
index f631f75c445..d85fdcbae5a 100644
--- a/neutron/db/api.py
+++ b/neutron/db/api.py
@@ -107,7 +107,10 @@ def get_engine():
 
 
 def dispose():
-    get_engine().pool.dispose()
+    # TODO(akamyshnikova): Use context_manager.dispose_pool() when it is
+    #                      available in oslo.db
+    if context_manager._factory._started:
+        get_engine().pool.dispose()
 
 
 #TODO(akamyshnikova): when all places in the code, which use sessions/