--- a/resourcemgmt/hwresourcesmgr/server/src/HWRMPowerCommonData.cpp Fri Jun 11 14:56:08 2010 +0300
+++ b/resourcemgmt/hwresourcesmgr/server/src/HWRMPowerCommonData.cpp Thu Jul 01 11:20:10 2010 +0300
@@ -166,10 +166,13 @@
delete iPowerService;
iPowerService = NULL;
- iMaxReportingPeriodNotifyHandler->StopListening();
- delete iMaxReportingPeriodNotifyHandler;
- iMaxReportingPeriodNotifyHandler = NULL;
-
+ if (iMaxReportingPeriodNotifyHandler)
+ {
+ iMaxReportingPeriodNotifyHandler->StopListening();
+ delete iMaxReportingPeriodNotifyHandler;
+ iMaxReportingPeriodNotifyHandler = NULL;
+ }
+
delete iRepository;
iRepository = NULL;