From c121a784aea9312a10122c7ee2b5c74b4d62b842 Mon Sep 17 00:00:00 2001
From: Ralph Castain <rhc@open-mpi.org>
Date: Sun, 7 Apr 2013 13:52:28 +0000
Subject: [PATCH] Remove some weird code around opal_db_close and cleanup that
 framework's open/close operation

This commit was SVN r28298.
---
 opal/mca/db/base/Makefile.am                         |  3 +--
 opal/mca/db/base/{db_base_open.c => db_base_frame.c} | 10 ++++++++--
 2 files changed, 9 insertions(+), 4 deletions(-)
 rename opal/mca/db/base/{db_base_open.c => db_base_frame.c} (88%)

diff --git a/opal/mca/db/base/Makefile.am b/opal/mca/db/base/Makefile.am
index a2c82028b6..09cc5e089a 100644
--- a/opal/mca/db/base/Makefile.am
+++ b/opal/mca/db/base/Makefile.am
@@ -14,7 +14,6 @@ headers += \
 	base/base.h
 
 libmca_db_la_SOURCES += \
-	base/db_base_open.c \
-	base/db_base_close.c \
+	base/db_base_frame.c \
 	base/db_base_select.c \
         base/db_base_fns.c
diff --git a/opal/mca/db/base/db_base_open.c b/opal/mca/db/base/db_base_frame.c
similarity index 88%
rename from opal/mca/db/base/db_base_open.c
rename to opal/mca/db/base/db_base_frame.c
index 608c997899..d3e4dea8ec 100644
--- a/opal/mca/db/base/db_base_open.c
+++ b/opal/mca/db/base/db_base_frame.c
@@ -41,8 +41,14 @@ opal_db_base_module_t opal_db = {
 };
 opal_db_base_t opal_db_base;
 
-/* Declared in opal_db_close.c */
-int opal_db_base_close(void);
+static int opal_db_base_close(void)
+{
+    if (NULL != opal_db.finalize) {
+        opal_db.finalize();
+    }
+
+    return mca_base_framework_components_close(&opal_db_base_framework, NULL);
+}
 
 static int opal_db_base_open(mca_base_open_flag_t flags)
 {