From 354ef28985be73e0c3d46ae680ec1a08f0ccc46e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartins@fdi.ucm.es>
Date: Fri, 10 Feb 2012 13:24:52 +0100
Subject: [PATCH] Feature #1112: Continue integration of DatastorePool in
Nebula class
---
include/Nebula.h | 4 ++--
src/nebula/Nebula.cc | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/include/Nebula.h b/include/Nebula.h
index 03a928b498..a1c7cba6d6 100644
--- a/include/Nebula.h
+++ b/include/Nebula.h
@@ -260,7 +260,7 @@ private:
// -----------------------------------------------------------------------
Nebula():nebula_configuration(0),db(0),vmpool(0),hpool(0),vnpool(0),
- upool(0),ipool(0),gpool(0),tpool(0),lcm(0),vmm(0),im(0),tm(0),
+ upool(0),ipool(0),gpool(0),tpool(0),dspool(0),lcm(0),vmm(0),im(0),tm(0),
dm(0),rm(0),hm(0),authm(0),aclm(0),imagem(0)
{
const char * nl = getenv("ONE_LOCATION");
@@ -331,7 +331,7 @@ private:
if ( dspool != 0)
{
- delete tpool;
+ delete dspool;
}
if ( vmm != 0)
diff --git a/src/nebula/Nebula.cc b/src/nebula/Nebula.cc
index be7ed52f8d..bb2f1f6ebc 100644
--- a/src/nebula/Nebula.cc
+++ b/src/nebula/Nebula.cc
@@ -248,6 +248,7 @@ void Nebula::start()
rc += ImagePool::bootstrap(db);
rc += VMTemplatePool::bootstrap(db);
rc += AclManager::bootstrap(db);
+ rc += DatastorePool::bootstrap(db);
// Create the versioning table only if bootstrap went well
if ( rc == 0 )