From 660b4c54db79c73afedd10bd66c2e298efe2cb7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Fri, 28 Jan 2011 11:23:50 +0000 Subject: [PATCH] Feature #457: Fix memory leaks in tests --- src/test/Nebula.cc | 75 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 74 insertions(+), 1 deletion(-) diff --git a/src/test/Nebula.cc b/src/test/Nebula.cc index cf4fecfb89..7bd78bfb84 100644 --- a/src/test/Nebula.cc +++ b/src/test/Nebula.cc @@ -48,7 +48,80 @@ void Nebula::start() NebulaTest * tester; tester = NebulaTest::instance(); - + + // Because Nebula is accessed only using ::instance(), it can't be + // deleted. Tests use the start method several times before the + // destructor is invoked, so this clean-up is necessary + if ( vmpool != 0) + { + delete vmpool; + } + + if ( vnpool != 0) + { + delete vnpool; + } + + if ( hpool != 0) + { + delete hpool; + } + + if ( upool != 0) + { + delete upool; + } + + if ( ipool != 0) + { + delete ipool; + } + + if ( vmm != 0) + { + delete vmm; + } + + if ( lcm != 0) + { + delete lcm; + } + + if ( im != 0) + { + delete im; + } + + if ( tm != 0) + { + delete tm; + } + + if ( dm != 0) + { + delete dm; + } + + if ( rm != 0) + { + delete rm; + } + + if ( hm != 0) + { + delete hm; + } + + if ( authm != 0) + { + delete authm; + } + + if ( nebula_configuration != 0) + { + delete nebula_configuration; + } + // ----------------------------------------------------------- // Configuration // -----------------------------------------------------------