B: Force free memory of object templates

(cherry picked from commit fa79b91974)
This commit is contained in:
Ruben S. Montero committed 2017-10-06 23:27:21 +02:00
1 parent 139f448a76
commit 721efccf13
17 files changed
+26 -69

No files matched your search

+1 -4
View File
@@ -68,10 +68,7 @@ Datastore::Datastore(
group_u = 1;
}
Datastore::~Datastore()
{
delete obj_template;
};
Datastore::~Datastore(){};
/* ------------------------------------------------------------------------ */
/* ------------------------------------------------------------------------ */
+1 -4
View File
@@ -45,10 +45,7 @@ Document::Document( int id,
/* ------------------------------------------------------------------------ */
/* ------------------------------------------------------------------------ */
Document::~Document()
{
delete obj_template;
}
Document::~Document(){};
/* ************************************************************************ */
/* Document :: Database Access Functions */
+1 -4
View File
@@ -51,10 +51,7 @@ Host::Host(
replace_template_attribute("VM_MAD", vmm_mad_name);
}
Host::~Host()
{
delete obj_template;
}
Host::~Host(){};
/* ************************************************************************ */
/* Host :: Database Access Functions */
+11 -14
View File
@@ -62,23 +62,20 @@ Image::Image(int _uid,
app_clone_collection("APP_CLONES"),
snapshots(-1, false),
target_snapshot(-1)
{
if (_image_template != 0)
{
obj_template = _image_template;
}
else
{
obj_template = new ImageTemplate;
if (_image_template != 0)
{
obj_template = _image_template;
}
else
{
obj_template = new ImageTemplate;
}
set_umask(_umask);
}
set_umask(_umask);
}
Image::~Image()
{
delete obj_template;
}
Image::~Image(){};
/* ************************************************************************ */
/* Image :: Database Access Functions */
+1 -4
View File
@@ -65,10 +65,7 @@ MarketPlace::MarketPlace(
set_umask(umask);
};
MarketPlace::~MarketPlace()
{
delete obj_template;
};
MarketPlace::~MarketPlace(){};
/* *************************************************************************** */
/* MartketPlace :: Database Access Functions */
+1 -4
View File
@@ -69,10 +69,7 @@ MarketPlaceApp::MarketPlaceApp(
set_umask(umask);
};
MarketPlaceApp::~MarketPlaceApp()
{
delete obj_template;
};
MarketPlaceApp::~MarketPlaceApp(){};
/* ************************************************************************ */
/* MartketPlaceApp:: Database Access Functions */
+1 -4
View File
@@ -63,10 +63,7 @@ SecurityGroup::SecurityGroup(
/* -------------------------------------------------------------------------- */
/* -------------------------------------------------------------------------- */
SecurityGroup::~SecurityGroup()
{
delete obj_template;
};
SecurityGroup::~SecurityGroup(){};
/* ************************************************************************ */
/* SecurityGroup :: Database Access Functions */
+1 -4
View File
@@ -55,10 +55,7 @@ Vdc::Vdc(int id, Template* vdc_template):
/* -------------------------------------------------------------------------- */
/* -------------------------------------------------------------------------- */
Vdc::~Vdc()
{
delete obj_template;
};
Vdc::~Vdc(){};
/* ************************************************************************ */
/* Vdc :: Database Access Functions */
-1
View File
@@ -89,7 +89,6 @@ VirtualMachine::~VirtualMachine()
}
delete _log;
delete obj_template;
delete user_obj_template;
}
+1 -4
View File
@@ -52,10 +52,7 @@ VMGroup::VMGroup(int _uid, int _gid, const string& _uname, const string& _gname,
set_umask(_umask);
}
VMGroup::~VMGroup()
{
delete obj_template;
}
VMGroup::~VMGroup(){};
/* -------------------------------------------------------------------------- */
/* -------------------------------------------------------------------------- */
+1 -4
View File
@@ -47,10 +47,7 @@ VMTemplate::VMTemplate(int id,
/* ------------------------------------------------------------------------ */
/* ------------------------------------------------------------------------ */
VMTemplate::~VMTemplate()
{
delete obj_template;
}
VMTemplate::~VMTemplate(){};
/* ************************************************************************ */
/* VMTemplate :: Database Access Functions */
+1 -4
View File
@@ -64,10 +64,7 @@ VirtualNetwork::VirtualNetwork(int _uid,
/* -------------------------------------------------------------------------- */
/* -------------------------------------------------------------------------- */
VirtualNetwork::~VirtualNetwork()
{
delete obj_template;
}
VirtualNetwork::~VirtualNetwork(){};
/* -------------------------------------------------------------------------- */
/* -------------------------------------------------------------------------- */
+1 -4
View File
@@ -69,10 +69,7 @@ VirtualRouter::VirtualRouter( int id,
/* ------------------------------------------------------------------------ */
/* ------------------------------------------------------------------------ */
VirtualRouter::~VirtualRouter()
{
delete obj_template;
}
VirtualRouter::~VirtualRouter(){};
/* ************************************************************************ */
/* VirtualRouter :: Database Access Functions */
-2
View File
@@ -55,8 +55,6 @@ Zone::Zone(int id, Template* zone_template):
Zone::~Zone()
{
delete obj_template;
delete servers;
};