--- a/lowlevellibsandfws/pluginfw/Framework/FrameTests/MagicUnitTests.cpp	Fri Jun 11 15:26:22 2010 +0300
+++ b/lowlevellibsandfws/pluginfw/Framework/FrameTests/MagicUnitTests.cpp	Wed Aug 18 11:27:44 2010 +0300
@@ -60,6 +60,8 @@
 	iStateAccessor = NULL;
 	delete iCtorValidator;
 	delete iDtorValidator;
+	iCtorValidator = 0;
+	iDtorValidator = 0;
 
 	return error;
 	}
@@ -273,10 +275,16 @@
 	TInt error = CUnitTest::RunError(aError);	// Chain to base
 	delete iUTContext;
 	delete iStateAccessor;
+	
+	iUTContext = 0;
+	iStateAccessor = 0;
 
 	delete iCtorValidator;
 	delete iDtorValidator;
 
+	iCtorValidator = 0;
+	iDtorValidator = 0;
+	
 	return error;
 	}
 
@@ -335,11 +343,17 @@
 	{
 	// The RunL left so chain to the base first and then cleanup
 	TInt error = CUnitTest::RunError(aError);	// Chain to base
-	delete iUTContext;
-	delete iStateAccessor;
+    delete iUTContext;
+    delete iStateAccessor;
+
+    delete iCtorValidator;
+    delete iDtorValidator;
 
-	delete iCtorValidator;
-	delete iDtorValidator;
+    iUTContext = 0;
+    iStateAccessor = 0;
+
+    iCtorValidator = 0;
+    iDtorValidator = 0;
 
 	return error;
 	}
@@ -399,12 +413,19 @@
 	{
 	// The RunL left so chain to the base first and then cleanup
 	TInt error = CUnitTest::RunError(aError);	// Chain to base
-	delete iUTContext;
-	delete iStateAccessor;
+    delete iUTContext;
+    delete iStateAccessor;
+
+    delete iCtorValidator;
+    delete iDefaultValidator;
+    delete iDtorValidator;
 
-	delete iCtorValidator;
-	delete iDefaultValidator;
-	delete iDtorValidator;
+    iUTContext = 0;
+    iStateAccessor = 0;
+
+    iCtorValidator = 0;
+    iDefaultValidator = 0;
+    iDtorValidator = 0;
 
 	return error;
 	}
@@ -467,12 +488,19 @@
 	{
 	// The RunL left so chain to the base first and then cleanup
 	TInt error = CUnitTest::RunError(aError);	// Chain to base
-	delete iUTContext;
-	delete iStateAccessor;
+    delete iUTContext;
+    delete iStateAccessor;
+
+    delete iCtorValidator;
+    delete iDefaultValidator;
+    delete iDtorValidator;
 
-	delete iCtorValidator;
-	delete iDefaultValidator;
-	delete iDtorValidator;
+    iUTContext = 0;
+    iStateAccessor = 0;
+
+    iCtorValidator = 0;
+    iDefaultValidator = 0;
+    iDtorValidator = 0;
 
 	return error;
 	}