--- a/sipproviderplugins/sipprovider/sipconnectionplugins/src/sipscpr.cpp Tue Feb 02 01:03:15 2010 +0200
+++ b/sipproviderplugins/sipprovider/sipconnectionplugins/src/sipscpr.cpp Fri Apr 16 15:18:54 2010 +0300
@@ -127,6 +127,7 @@
CSipSubConnectionProvider::~CSipSubConnectionProvider()
{
LOG_NODE_DESTROY(KSipSCprTag, CSipSubConnectionProvider);
+ if(iSipSm != NULL)
iSipSm->DeleteWhenReady();
}
@@ -348,8 +349,13 @@
return;
}
sipevent->SetResponse(aSipCode);
- NotifyClientsL(*sipevent);
- }
+ TRAP(error, NotifyClientsL(*sipevent));
+ if (error != KErrNone)
+ {
+ __CFLOG_VAR((KSipSCprTag, KSipSCprSubTag, _L8("NotifyClientsL left with the error: [%d]"), error));
+ return;
+ }
+ }
}
/**
@@ -417,7 +423,12 @@
__CFLOG_VAR((KSipSCprTag, KSipSCprSubTag, _L8("CSubConSIPAuthenticationRequiredEvent::SetRealmL() left with error [%d]"), error));
return;
}
- NotifyClientsL(*event);
+ TRAP(error, NotifyClientsL(*event));
+ if (error != KErrNone)
+ {
+ __CFLOG_VAR((KSipSCprTag, KSipSCprSubTag, _L8("NotifyClientsL left with the error: [%d]"), error));
+ return;
+ }
#endif
}
@@ -430,11 +441,21 @@
__CFLOG_VAR((KSipSCprTag, KSipSCprSubTag, _L8("CSipSubConnectionProvider::ReceiveNotification")));
CSubConSIPNotificationEvent* event = CSubConSIPNotificationEvent::NewL();
- event->SetNotificationL(aNotification);
+ TRAPD(error, event->SetNotificationL(aNotification));
+ if (error != KErrNone)
+ {
+ __CFLOG_VAR((KSipSCprTag, KSipSCprSubTag, _L8("event->SetNotificationL left with the error: [%d]"), error));
+ return;
+ }
TInt32 gId = event->GroupId();
- NotifyClientsL(*event);
+ TRAP(error, NotifyClientsL(*event));
+ if (error != KErrNone)
+ {
+ __CFLOG_VAR((KSipSCprTag, KSipSCprSubTag, _L8("NotifyClientsL left with the error: [%d]"), error));
+ return;
+ }
}
/**